]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 11 May 2019 16:23:46 +0000 (18:23 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sat, 11 May 2019 16:23:46 +0000 (18:23 +0200)
commit2b97d9d780fd3326a470693164f71464c106d4ca
tree38feb32acfc878f51f1cca59fd1da6f90e87da19
parent3ea5c045d712713535f130e4c462a00845946dda
parent6d44f2441bf2aa14d11e481d9d2cfe82a74d81ed
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/styles/mastodon/components.scss
app/serializers/rest/status_serializer.rb