]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1506-tag-users
authorMichael Vogel <icarus@dabo.de>
Thu, 4 Jun 2015 05:36:38 +0000 (07:36 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 4 Jun 2015 05:36:38 +0000 (07:36 +0200)

Trivial merge