From d1b64ca847b44b86a22ac54b101ffdd6aa75ac4d Mon Sep 17 00:00:00 2001
From: Matthieu Aubry <matt@piwik.org>
Date: Mon, 5 Jan 2015 23:53:21 +1300
Subject: [PATCH] change CustomAlerts branch to master after PR was merged
---
.gitmodules | 12 ++++++------
1 file 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
--
GitLab