mastodon/db
Thibaut Girka 42713b9710 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- README.md: kept our version
2019-01-28 21:14:47 +01:00
..
migrate Merge branch 'master' into glitch-soc/merge-upstream 2019-01-28 21:14:47 +01:00
post_migrate Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
schema.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
seeds.rb Fix db/seeds.rb (#9738) 2019-01-07 08:14:53 +01:00