Claire
f8d867bac4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict caused by us having a distinc Direct timeline.
Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict between glitch-soc's variable character limit and upstream
refactoring that part of the code.
Ported upstream changes.
2020-12-05 17:33:37 +01:00
..
2020-11-20 13:27:48 +01:00
2019-07-02 00:34:38 +02:00
2019-09-29 21:31:51 +02:00
2019-07-07 16:16:51 +02:00
2020-07-14 19:05:07 +02:00
2020-05-10 09:50:54 +02:00
2020-10-21 19:10:50 +02:00
2020-11-12 23:05:24 +01:00
2019-09-29 21:31:51 +02:00
2020-11-19 17:38:06 +01:00
2020-04-15 20:33:24 +02:00
2020-09-01 03:04:00 +02:00
2020-07-19 22:28:27 +02:00
2020-10-12 16:33:49 +02:00
2020-09-08 16:26:47 +02:00
2020-10-13 14:35:07 +02:00
2020-06-02 19:24:53 +02:00
2020-06-25 22:45:01 +02:00
2019-03-18 21:00:55 +01:00
2020-04-05 14:40:08 +02:00
2019-07-02 00:34:38 +02:00
2020-09-26 20:57:39 +02:00
2020-06-30 23:58:02 +02:00
2020-10-21 19:10:50 +02:00
2019-08-16 13:00:30 +02:00
2019-12-30 18:30:24 +01:00
2020-09-01 03:04:00 +02:00
2020-01-17 07:50:30 +01:00
2019-07-07 16:16:51 +02:00
2020-11-27 15:48:31 +01:00
2020-05-28 12:47:40 +02:00
2019-09-23 17:25:10 +02:00
2020-10-21 19:10:50 +02:00
2020-05-14 23:28:06 +02:00
2020-11-08 00:28:39 +01:00