https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93ea37e 98c5eb1)
Merge remote-tracking branch 'friendica/develop' into develop
authorHypolite Petovan <mrpetovan@gmail.com>
Sat, 7 Jan 2017 12:23:50 +0000 (23:23 +1100)
committerHypolite Petovan <mrpetovan@gmail.com>
Sat, 7 Jan 2017 12:23:50 +0000 (23:23 +1100)

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