Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <matt@piwik.org>2015-01-05 13:53:21 +0300
committerMatthieu Aubry <matt@piwik.org>2015-01-05 13:53:21 +0300
commitd1b64ca847b44b86a22ac54b101ffdd6aa75ac4d (patch)
tree98f1d192727fe79d16436d569bb8711908e2a5c3 /.gitmodules
parent899c37ce8ab5d3a3406e8aaeaedbed9d9fb013ca (diff)
change CustomAlerts branch to master after PR was merged
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index a0e8238efe..084907ad46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,7 +21,7 @@
[submodule "plugins/CustomAlerts"]
path = plugins/CustomAlerts
url = https://github.com/piwik/plugin-CustomAlerts.git
- branch = translation
+ branch = master
[submodule "plugins/TasksTimetable"]
path = plugins/TasksTimetable
url = https://github.com/piwik/plugin-TasksTimetable.git
@@ -30,17 +30,17 @@
path = plugins/LoginHttpAuth
url = https://github.com/piwik/plugin-LoginHttpAuth.git
branch = master
+[submodule "plugins/QueuedTracking"]
+ path = plugins/QueuedTracking
+ url = https://github.com/piwik/plugin-QueuedTracking.git
+ branch = master
# Note: when you add a submodule that SHOULD be left in the packaged release such as the few submodules below,
# then you MUST add these submodules names in the SUBMODULES_PACKAGED_WITH_CORE variable in:
# https://github.com/piwik/piwik-package/blob/master/scripts/build-package.sh
-[submodule "plugins/QueuedTracking"]
- path = plugins/QueuedTracking
- url = https://github.com/piwik/plugin-QueuedTracking.git
- branch = master
[submodule "libs/PiwikTracker"]
path = libs/PiwikTracker
url = https://github.com/piwik/piwik-php-tracker.git
- branch = master \ No newline at end of file
+ branch = master