]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b361f8 49ab3a1)
Merge branch 'sembrestels-patch-2' into 1.8
authorSteve Clay <steve@mrclay.org>
Sat, 21 Sep 2013 01:21:12 +0000 (21:21 -0400)
committerSteve Clay <steve@mrclay.org>
Sat, 21 Sep 2013 01:21:12 +0000 (21:21 -0400)
1  2 
engine/lib/users.php patch | diff1 | diff2 | blob | history

diff --cc engine/lib/users.php
Simple merge
Social Networking Engine