aboutsummaryrefslogtreecommitdiff
path: root/activate.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-29 04:19:50 +0200
committerSem <sembrestels@riseup.net>2012-07-29 04:19:50 +0200
commit55bb2b7ed2583683548e314ae13fadde61eb04d6 (patch)
tree18aa780112c293ef078b7651a0c7f08ffd6b13da /activate.php
parent7a9177c9df49d6fc02280df02d6e7f6d52531382 (diff)
parent12a88208acec40e190b0729887e28c9d9add26c3 (diff)
downloadelgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.gz
elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.bz2
Merge branch 'no-tagging-photos' of git://github.com/sembrestels/Tidypics
Conflicts: languages/de.php languages/en.php start.php views/default/forms/photos/admin/settings/main.php views/default/photos/css.php
Diffstat (limited to 'activate.php')
0 files changed, 0 insertions, 0 deletions