]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean
authorMichael <heluecht@pirati.ca>
Fri, 4 Nov 2016 22:57:43 +0000 (22:57 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 4 Nov 2016 22:57:43 +0000 (22:57 +0000)

Trivial merge