https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 400bab6 53b7e4b)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorFriendica <friendica@friendica.astifter.com>
Thu, 19 Apr 2018 19:24:35 +0000 (19:24 +0000)
committerFriendica <friendica@friendica.astifter.com>
Thu, 19 Apr 2018 19:24:35 +0000 (19:24 +0000)

Trivial merge
mirror https://github.com/friendica/friendica.git