]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/nightly' into nightly
authorwww-data <www-data@mail.gnusocial.de>
Mon, 4 Jul 2016 21:37:45 +0000 (23:37 +0200)
committerwww-data <www-data@mail.gnusocial.de>
Mon, 4 Jul 2016 21:37:45 +0000 (23:37 +0200)

Trivial merge