diff options
| author | Sem <sembrestels@riseup.net> | 2013-08-22 23:34:02 -0400 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-08-22 23:34:02 -0400 |
| commit | a399defd074e38191eb2c14258110bb2002e3333 (patch) | |
| tree | 1e180f83e41d7e27a7e1a593f2b01b6333947afb /views/default/friendrequest | |
| parent | 3545f0d797ee157bfa1654b318cf0a14e1637483 (diff) | |
| parent | e90c8fef1af6a1ce1e5480067955ca29caba3b83 (diff) | |
| download | elgg-a399defd074e38191eb2c14258110bb2002e3333.tar.gz elgg-a399defd074e38191eb2c14258110bb2002e3333.tar.bz2 | |
Merge branch '1.8' of gitorious.org:lorea/friendrequest into 1.8
Conflicts:
actions/friends/add.php
actions/friends/remove.php
Diffstat (limited to 'views/default/friendrequest')
0 files changed, 0 insertions, 0 deletions