]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' of http://github.com/rebeka-catalina/friendica into develop
authorrebeka-catalina <github@rct.in-berlin.de>
Sat, 8 Apr 2017 09:42:20 +0000 (11:42 +0200)
committerrebeka-catalina <github@rct.in-berlin.de>
Sat, 8 Apr 2017 09:42:20 +0000 (11:42 +0200)

Trivial merge