]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
authorncls7615 <himasoto@gmail.com>
Mon, 11 Dec 2017 00:43:21 +0000 (09:43 +0900)
committerncls7615 <himasoto@gmail.com>
Mon, 11 Dec 2017 00:43:21 +0000 (09:43 +0900)
commita98b0a47ef19f587da60907b68c5c5edfde432a0
tree50a37fa1dc6aafb1210a441dd989605a646d3e21
parent0e567977923f2e7827192da0990d529859033f1a
parent26c9b9fa276fd629789fd06f65a5d698b182f67a
Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles

# Conflicts:
# app/javascript/glitch/locales/ja.json
app/javascript/flavours/glitch/locales/ja.js