]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6498978 c3ae4a0)
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)
Conflicts:
include/identity.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.