]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into 1504-contact-update
authorMichael Vogel <icarus@dabo.de>
Sun, 12 Apr 2015 07:59:28 +0000 (09:59 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 12 Apr 2015 07:59:28 +0000 (09:59 +0200)
commit1058d055d16f0cd7ce000c22b038dbad86334ce3
tree2425821846308bacc4e46492c5374633cf8c8041
parent2c3e2908b244d4d6a95104f8278eaecd57bd3a1d
parent8b2742dc7d5305e4be19fa6a7b21da1f9805434c
Merge remote-tracking branch 'upstream/develop' into 1504-contact-update

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