]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/master' into nightly
authorwww-data <www-data@mail.gnusocial.de>
Thu, 1 Sep 2016 15:23:31 +0000 (17:23 +0200)
committerwww-data <www-data@mail.gnusocial.de>
Thu, 1 Sep 2016 15:23:31 +0000 (17:23 +0200)

Trivial merge