aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-11-22 17:16:40 +0100
committerSem <sembrestels@riseup.net>2012-11-22 17:16:40 +0100
commit13294abf956e5c62691e97e682d54b501d9379da (patch)
tree5dad1b4ffed0713e0bca2904dea2894e40eebb9c
parent7f4f57ef1ebd8b97370094da2518dd39e183a43d (diff)
parent4cea9b369687b5e6ec384d394249d073ea922413 (diff)
downloadelgg-13294abf956e5c62691e97e682d54b501d9379da.tar.gz
elgg-13294abf956e5c62691e97e682d54b501d9379da.tar.bz2
Merge branch 'lorea-preprod' of gitorious.org:lorea/Elgg into lorea-preprod
m---------mod/elggman0
m---------mod/etherpad0
m---------mod/event_calendar10
m---------mod/favorites0
m---------mod/linkup0
m---------mod/openid_server10
m---------mod/spotlight0
m---------mod/subgroups0
m---------mod/tasks0
m---------mod/threads0
m---------mod/upgrade-tools0
11 files changed, 10 insertions, 10 deletions
diff --git a/mod/elggman b/mod/elggman
-Subproject 21ca84194e193d25be01d376ad0379239605266
+Subproject b992c9aa0b0d9653dc6ebb96feda1bedf35cfeb
diff --git a/mod/etherpad b/mod/etherpad
-Subproject 6113e31960ddc64b712b57d0e885754aa6d3bc3
+Subproject 97af90ff30b5df10e392c92868d1828f601641c
diff --git a/mod/event_calendar b/mod/event_calendar
-Subproject b23e75b25f8db91bebf3a748a686e5a7e874753
+Subproject e2203e7aae84ec772eb61621a199be4bb7b32f0
diff --git a/mod/favorites b/mod/favorites
-Subproject 2c5a8a417cceb2cd1927df5500ff4ca678de27f
+Subproject fc148044fdb2b087cef9f9294b5597be0152ae6
diff --git a/mod/linkup b/mod/linkup
-Subproject 1ae3435df4fdfcdeaee9c41560ea356ef4ee23c
+Subproject acf1af7824e533226a32e9c405b8270cb32da2a
diff --git a/mod/openid_server b/mod/openid_server
-Subproject bc0ed096c45e6dd3b31859cb8adc577b6a548d3
+Subproject d29b27d2a02b27118a97475abdd21b8a4dd434d
diff --git a/mod/spotlight b/mod/spotlight
-Subproject 8a48163d7f7d781255098c1278f1f91c0cb32aa
+Subproject b7f9fdaf7a923eff7013fbf23b8d101c82908c4
diff --git a/mod/subgroups b/mod/subgroups
-Subproject 11ab637a431a0a0a8fc68302b7c83faee029e9a
+Subproject 835015b66b9de6dc6de91ab39f95e1f09b2dbf8
diff --git a/mod/tasks b/mod/tasks
-Subproject 0140e1e4eb0d94aefe60ec425b1465dbee714d0
+Subproject e9ae0c2ef1cba31c1d17882eaf66dbe1901c432
diff --git a/mod/threads b/mod/threads
-Subproject eeabbfc0f70ef4c08e5b3c6f3228c83645505a5
+Subproject d6c2d785f5e736cc5600fd732abfc3666eceebf
diff --git a/mod/upgrade-tools b/mod/upgrade-tools
-Subproject cce83f92ace326eb6482ef370dbdca02573d43e
+Subproject bd399d9e5e0eb98da290c7913a4ed88ade70d9e