]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1611-frontend
authorMichael <heluecht@pirati.ca>
Wed, 30 Nov 2016 04:46:47 +0000 (04:46 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 30 Nov 2016 04:46:47 +0000 (04:46 +0000)

Trivial merge