]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 28 Jan 2020 18:15:03 +0000 (19:15 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 28 Jan 2020 18:15:03 +0000 (19:15 +0100)
commit44744e3ce14938b4cc826d1d8612aaa7095aa3ef
tree6e95e682138ff39de8e558d56c78d6b814e8ae05
parent67b8af34b3df55ba74a53af731f275d0a4c6d9f8
parent1051de0165e6e6555e8d27b90bb622cb0c4908b2
Merge branch 'master' into glitch-soc/merge-upstream
Gemfile
Gemfile.lock
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
config/locales/en.yml