]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
authorMichael Vogel <icarus@dabo.de>
Thu, 3 Dec 2015 13:38:04 +0000 (14:38 +0100)
committerMichael Vogel <icarus@dabo.de>
Thu, 3 Dec 2015 13:38:04 +0000 (14:38 +0100)
commit1a170c874368e3ce77eb569702462e54c96239a2
tree4946a08fd6588dd835dddeab3e5c76bf640b9ce8
parent4286225f370c9c018e6d80349878072516ff3ef4
parent1f9644bdedf843a6bc3b9af3bfda20e5205ce018
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework

Conflicts:
mod/contacts.php
mod/crepair.php
include/items.php
include/ostatus.php
mod/contacts.php
mod/crepair.php