]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 4 Apr 2020 19:47:37 +0000 (21:47 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sat, 4 Apr 2020 19:47:37 +0000 (21:47 +0200)
commit8fef96cbf507324138c2d59b00ffc82ef4fac11a
tree5543993f6692b48b10c7943e6a8bab2f240ca1f7
parent5c5317041f17375666bfaf4788f0adf71804b47d
parentd3ff06a3205130fa10ffc5d736e8206a9725b5df
Merge branch 'master' into glitch-soc/merge-upstream
Vagrantfile
app/javascript/core/admin.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
config/locales/en.yml