]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 14 Mar 2019 19:11:17 +0000 (20:11 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 14 Mar 2019 19:11:17 +0000 (20:11 +0100)
1  2 
db/schema.rb

diff --cc db/schema.rb
Simple merge