]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Thu, 7 Dec 2017 04:17:14 +0000 (04:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Thu, 7 Dec 2017 04:17:14 +0000 (04:17 +0000)
1  2 
db/schema.rb

diff --cc db/schema.rb
Simple merge