Thibaut Girka 5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream ...

No conflicts.

2019-01-19 18:28:37 +01:00

..

migrate

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-19 18:28:37 +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