]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 20 Mar 2019 16:32:39 +0000 (17:32 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 20 Mar 2019 16:32:39 +0000 (17:32 +0100)
1  2 
app/models/status.rb
app/views/stream_entries/_simple_status.html.haml

Simple merge