]> git.mxchange.org Git - friendica.git/commit
Merge develop into 2512_rebase_cleanup
authorrabuzarus <>
Fri, 25 Dec 2015 18:18:12 +0000 (19:18 +0100)
committerrabuzarus <>
Fri, 25 Dec 2015 18:18:12 +0000 (19:18 +0100)
commitba2517fd716fe93ef95c644fd50794c809e27640
tree9f1df374554b9285b18851c3ffe51776f1afd929
parent64989781ff34eddb3722d32a4ff90c9c502bdfab
parentc3ae4a03bb84dded24ce2643b58466f0abedf437
Merge develop into 2512_rebase_cleanup

Conflicts:
include/identity.php