]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'master' into nightly
authorMikael Nordfeldth <mmn@hethane.se>
Sun, 16 Apr 2017 09:04:58 +0000 (11:04 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Sun, 16 Apr 2017 09:04:58 +0000 (11:04 +0200)

Trivial merge