https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 291906d 5592837)
Merge branch 'develop' of git://github.com/friendica/friendica into develop
authorrebeka-catalina <github@rct.in-berlin.de>
Sat, 8 Apr 2017 12:50:45 +0000 (14:50 +0200)
committerrebeka-catalina <github@rct.in-berlin.de>
Sat, 8 Apr 2017 12:50:45 +0000 (14:50 +0200)

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