]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 28 Mar 2019 17:35:25 +0000 (18:35 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 28 Mar 2019 17:35:25 +0000 (18:35 +0100)
commitce7d055d3cc7927a597c8bb56b45f8e0aae91319
tree4ba415e02d601654867889da11391b509909635d
parentbb316faffff7a76bc89f7e942233f0e14caf60f5
parent58667072d9923b17c90543550294aa9f801103d7
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/styles/mastodon/components.scss
config/locales/en.yml
config/routes.rb