]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 6 Mar 2019 21:39:22 +0000 (22:39 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 6 Mar 2019 21:39:22 +0000 (22:39 +0100)
1  2 
db/schema.rb

diff --cc db/schema.rb
Simple merge