Thibaut Girka
8c3c27bf06
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream change too close to a glitch-soc change related to
instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
Minor conflict due to glitch-soc's handling of Direct Messages,
merged upstream changes.
- `yarn.lock`:
Not really a conflict, caused by glitch-soc-only dependencies
being textually too close to updated upstream dependencies.
Merged upstream changes.
2020-08-30 16:13:08 +02:00
..
2020-06-29 13:56:55 +02:00
2020-06-03 08:33:30 +02:00
2020-06-02 19:24:53 +02:00
2020-07-26 23:58:36 +02:00
2020-07-13 19:33:10 +02:00
2019-07-25 04:17:35 +02:00
2020-07-15 21:08:19 +02:00
2019-10-03 17:50:59 +02:00
2019-07-06 23:26:16 +02:00
2020-06-09 10:39:20 +02:00
2020-05-13 22:11:49 +02:00
2020-06-09 10:32:00 +02:00
2019-07-15 00:48:50 +02:00
2019-12-16 23:55:50 +01:00
2020-06-09 10:32:00 +02:00
2020-06-02 19:24:53 +02:00
2020-08-30 16:13:08 +02:00
2019-07-06 23:26:16 +02:00
2020-07-07 10:55:18 +02:00
2019-12-18 16:56:06 +01:00
2019-12-18 16:54:03 +01:00
2020-04-25 22:01:08 +02:00
2020-03-08 15:17:39 +01:00
2020-08-25 13:39:35 +02:00
2020-06-09 10:26:58 +02:00
2019-09-29 16:23:13 +02:00
2019-12-01 17:25:29 +01:00
2020-03-27 22:28:39 +01:00
2019-06-27 16:44:12 +02:00
2019-07-28 05:59:51 +02:00
2020-07-24 11:26:40 +02:00
2020-06-09 10:39:20 +02:00
2019-07-06 23:26:16 +02:00
2020-05-13 22:11:49 +02:00
2019-06-04 23:11:18 +02:00
2020-06-09 10:26:58 +02:00
2020-03-12 23:06:43 +01:00
2020-05-14 23:37:37 +02:00
2019-09-11 16:32:44 +02:00
2019-09-28 01:02:21 +02:00
2020-07-15 21:08:19 +02:00
2019-08-07 20:20:23 +02:00
2019-07-06 23:26:16 +02:00
2019-07-06 23:26:16 +02:00
2019-09-17 08:44:45 +02:00
2020-07-19 22:28:27 +02:00
2019-01-24 15:38:18 +01:00
2020-01-12 14:17:03 +01:00