Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.		2018-10-05 15:23:57 +02:00
..
migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
post_migrate	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
schema.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-05 15:23:57 +02:00
seeds.rb	Fix db:seed - only run some validations when the field was changed (#3592)	2017-06-08 09:22:01 -04:00