]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Thu, 30 Nov 2017 03:17:12 +0000 (03:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Thu, 30 Nov 2017 03:17:12 +0000 (03:17 +0000)
1  2 
app/models/account.rb
app/services/remove_status_service.rb
db/schema.rb

Simple merge
Simple merge
diff --cc db/schema.rb
Simple merge