]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop
authorgerhard6380 <gerhard@seeber.at>
Fri, 23 Sep 2016 17:38:57 +0000 (19:38 +0200)
committergerhard6380 <gerhard@seeber.at>
Fri, 23 Sep 2016 17:38:57 +0000 (19:38 +0200)

Trivial merge