]> gitweb.fluxo.info Git - lorea/elgg.git/commit
Merge branch '1.8' of gitorious.org:lorea/friendrequest into 1.8
authorSem <sembrestels@riseup.net>
Fri, 23 Aug 2013 03:34:02 +0000 (23:34 -0400)
committerSem <sembrestels@riseup.net>
Fri, 23 Aug 2013 03:34:02 +0000 (23:34 -0400)
commita399defd074e38191eb2c14258110bb2002e3333
tree1e180f83e41d7e27a7e1a593f2b01b6333947afb
parent3545f0d797ee157bfa1654b318cf0a14e1637483
parente90c8fef1af6a1ce1e5480067955ca29caba3b83
Merge branch '1.8' of gitorious.org:lorea/friendrequest into 1.8

Conflicts:
actions/friends/add.php
actions/friends/remove.php
actions/friends/add.php
actions/friends/remove.php