]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7aa2b8 690932e)
Merge branch 'walled_garden' of https://github.com/cash/Elgg into 1.8
authorBrett Profitt <brett.profitt@gmail.com>
Tue, 24 Apr 2012 17:15:47 +0000 (10:15 -0700)
committerBrett Profitt <brett.profitt@gmail.com>
Tue, 24 Apr 2012 17:15:47 +0000 (10:15 -0700)
1  2 
engine/classes/ElggSite.php patch | diff1 | diff2 | blob | history

diff --cc engine/classes/ElggSite.php
Simple merge
Social Networking Engine