aboutsummaryrefslogtreecommitdiff
path: root/mod/profile/manifest.xml
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-08-04 01:50:01 +0200
committerSem <sembrestels@riseup.net>2012-08-04 01:50:01 +0200
commit18df06b9cd34c62dd8e9b1dfffd2f75e2815d859 (patch)
treee880bce8a7b10a6b3bc8c60168bc5ab35acf40f8 /mod/profile/manifest.xml
parent71edfd80a0baf95b86a29547252b01973511828f (diff)
parent4dd2ca9d54b64ebbf5eba3e3036f747cadb40825 (diff)
downloadelgg-18df06b9cd34c62dd8e9b1dfffd2f75e2815d859.tar.gz
elgg-18df06b9cd34c62dd8e9b1dfffd2f75e2815d859.tar.bz2
Merge branch 'translations-fallback-js' of git://github.com/sembrestels/Elgg into lorea-preprod
Conflicts: mod/developers/views/default/theme_preview/grid.php
Diffstat (limited to 'mod/profile/manifest.xml')
0 files changed, 0 insertions, 0 deletions