]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value
authorMichael Vogel <ike@pirati.ca>
Tue, 6 Sep 2016 19:10:57 +0000 (19:10 +0000)
committerMichael Vogel <ike@pirati.ca>
Tue, 6 Sep 2016 19:10:57 +0000 (19:10 +0000)

Trivial merge