]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge remote-tracking branch 'upstream/nightly' into nightly
authorwww-data <www-data@mail.gnusocial.de>
Tue, 21 Jun 2016 11:36:41 +0000 (13:36 +0200)
committerwww-data <www-data@mail.gnusocial.de>
Tue, 21 Jun 2016 11:36:41 +0000 (13:36 +0200)

Trivial merge