]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
authorMichael Vogel <icarus@dabo.de>
Fri, 28 Aug 2015 12:16:52 +0000 (14:16 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 28 Aug 2015 12:16:52 +0000 (14:16 +0200)

Trivial merge