diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-05-14 16:27:08 +0000 |
commit | 6ba1737c22a002a71210fcd15ad36c3c2bc68402 (patch) | |
tree | 22e44b38f986ac94ecb7d831d043d87ac687bf27 /engine/settings.example.php | |
parent | 368c947601348a68dd6805658e637a1e634779e5 (diff) | |
download | elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.gz elgg-6ba1737c22a002a71210fcd15ad36c3c2bc68402.tar.bz2 |
merge -r5832:5898 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6055 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/settings.example.php')
0 files changed, 0 insertions, 0 deletions