https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbf7c7d 6ff0cfb)
Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop
authorHypolite Petovan <ben.lort@gmail.com>
Wed, 25 Jan 2017 20:28:54 +0000 (15:28 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Wed, 25 Jan 2017 20:28:54 +0000 (15:28 -0500)

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