]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch '3.6-rc' of https://github.com/Andi-K/friendica into 3.6-rc
authorAndi <andiana@PC>
Wed, 21 Mar 2018 23:34:38 +0000 (00:34 +0100)
committerAndi <andiana@PC>
Wed, 21 Mar 2018 23:34:38 +0000 (00:34 +0100)

Trivial merge