]> git.mxchange.org Git - friendica.git/commit
Merge develop into 0602_contact_profile
authorrabuzarus <>
Tue, 9 Feb 2016 12:44:30 +0000 (13:44 +0100)
committerrabuzarus <>
Tue, 9 Feb 2016 12:44:30 +0000 (13:44 +0100)
commit743f2e0391315d6945b5c53a4d08938ee85e6aed
tree0764889bc83124b0a98a5f31f3af27e5093e85ad
parentc1c21ada0a9a728f18108168e0a324f7d84bd31c
parent2932ebfbc878ca7db958bcc20f841ae344938ee6
Merge develop into 0602_contact_profile

Conflicts:
mod/contacts.php
mod/contacts.php