aboutsummaryrefslogtreecommitdiff
path: root/js/lib/configuration.js
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2013-02-13 20:03:50 +0100
committerSem <sembrestels@riseup.net>2013-02-13 20:03:50 +0100
commit9ae3522b674a311e963b07513e4eee3c4729d2cd (patch)
tree2f62765c7c53ddacb35c7ac8034cfb9867b33fd5 /js/lib/configuration.js
parent5aff5b3913fbb6226d8fb3162453c58888fba38d (diff)
parentb3b12344bfee097b06019d6ee83b1952cb3088ea (diff)
downloadelgg-9ae3522b674a311e963b07513e4eee3c4729d2cd.tar.gz
elgg-9ae3522b674a311e963b07513e4eee3c4729d2cd.tar.bz2
Merge branch 'messages-reply' of git://github.com/sembrestels/Elgg into foxglove-2
Conflicts: mod/messages/pages/messages/read.php
Diffstat (limited to 'js/lib/configuration.js')
0 files changed, 0 insertions, 0 deletions