]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Sat, 25 Nov 2017 05:17:15 +0000 (05:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Sat, 25 Nov 2017 05:17:15 +0000 (05:17 +0000)
1  2 
app/models/status.rb
config/navigation.rb
db/schema.rb

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