Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
2019-08-17 22:02:37 +02:00
2019-07-15 06:12:05 +02:00
2019-06-12 15:56:18 +02:00
2019-06-13 16:49:19 +02:00
2019-08-17 22:02:37 +02:00
2019-08-19 19:05:13 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-19 19:05:13 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-07-15 06:12:05 +02:00
2019-06-12 15:56:18 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-07-15 06:12:05 +02:00
2019-06-12 15:56:18 +02:00
2019-08-18 03:48:39 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-19 19:05:13 +02:00
2019-08-17 22:02:37 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-08-17 22:02:37 +02:00
2019-07-15 06:12:05 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-19 19:05:13 +02:00
2019-08-19 19:05:13 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-07-15 06:12:05 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-06-12 15:56:18 +02:00
2019-06-12 15:56:18 +02:00
2019-08-19 19:05:13 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00
2019-08-17 22:02:37 +02:00