https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bebff8e 500f098)
Merge branch 'develop' of https://github.com/Hypolite/friendica into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Wed, 5 Apr 2017 01:48:36 +0000 (21:48 -0400)
committerHypolite Petovan <mrpetovan@gmail.com>
Wed, 5 Apr 2017 01:48:36 +0000 (21:48 -0400)

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