]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into bugfix-sql-date
authorMichael <heluecht@pirati.ca>
Thu, 23 Feb 2017 06:54:50 +0000 (06:54 +0000)
committerMichael <heluecht@pirati.ca>
Thu, 23 Feb 2017 06:54:50 +0000 (06:54 +0000)

Trivial merge