]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 20 Jan 2019 15:49:23 +0000 (16:49 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 20 Jan 2019 15:49:23 +0000 (16:49 +0100)
commit9dfbcf941ef9ec0428fb34065e020308760afa8f
treeea80051d20a9c5c22aed08fcbf64a67d31602a0f
parentaa362ab73dc7121104b3c01800152b9fc56ea396
parent31e7940de553007ea2e863cb9a418ad46837431e
Merge branch 'master' into glitch-soc/merge-upstream
13 files changed:
app/controllers/directories_controller.rb
app/javascript/mastodon/locales/ja.json
app/services/post_status_service.rb
config/locales/ca.yml
config/locales/de.yml
config/locales/gl.yml
config/locales/ja.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/sk.yml
lib/mastodon/version.rb