]> cat aescling's git repositories - mastodon.git/commit
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)
commitcbf1d711ba2fab4921bfcf57e7df0b952503f568
treea5b928c0da3b018c422b7337708d041bdb9be986
parent803c350ef5500229eafce222370c5f97a7532e41
parent80f0910e2141b24082b9143266a9a6cf1ef6a516
Merge branch 'master' into glitch-soc/merge-upstream
app/models/status.rb
app/views/stream_entries/_simple_status.html.haml