]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 19 May 2019 15:46:31 +0000 (17:46 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sun, 19 May 2019 15:46:31 +0000 (17:46 +0200)
1  2 
CONTRIBUTING.md
db/schema.rb

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