]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512...
authorMichael Vogel <icarus@dabo.de>
Fri, 4 Dec 2015 05:00:56 +0000 (06:00 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 4 Dec 2015 05:00:56 +0000 (06:00 +0100)

Trivial merge