]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 19 Feb 2019 19:18:40 +0000 (20:18 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 19 Feb 2019 19:18:40 +0000 (20:18 +0100)
1  2 
config/locales/en.yml
lib/mastodon/version.rb

Simple merge
Simple merge