]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 13 Aug 2020 20:17:29 +0000 (22:17 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 13 Aug 2020 20:17:29 +0000 (22:17 +0200)
1  2 
app/javascript/packs/public.js
app/views/statuses/_simple_status.html.haml
streaming/index.js

Simple merge
Simple merge