]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sat, 4 May 2019 17:15:50 +0000 (19:15 +0200)
commit52a4284fe5bb2b2a167a35eabe4f1607ac3957ca
treecb4696c66b62698386b676eec8c59359e6d8ba8d
parentbc97fd641f1f075e45f920fdc214f355ce16f53d
parent7aa749ab46b53bc5b234332ac35acc09a636fc28
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
lib/mastodon/version.rb