]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Tue, 11 Jul 2017 19:59:49 +0000 (21:59 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Tue, 11 Jul 2017 19:59:49 +0000 (21:59 +0200)

Trivial merge