Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		2018-08-17 17:43:54 +02:00
..
.gitkeep	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
20180813113448_copy_status_stats_cleanup.rb	Move status counters to separate table, count replies (#8104)	2018-08-14 19:19:32 +02:00
20180813160548_post_migrate_filters.rb	Split custom filter migration script using the post-deployment migration system	2018-08-16 20:30:09 +02:00