Thibaut Girka
e5f934ddf0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict caused because we have additional code to make sure pinned
local-only toots don't get rendered on the ActivityPub endpoints.
Ported upstream changes.
2020-09-07 09:21:38 +02:00
..
2020-09-07 09:21:38 +02:00
2020-08-13 22:17:29 +02:00
2020-09-07 09:21:38 +02:00
2020-08-30 16:13:08 +02:00
2020-09-01 17:02:18 +02:00
2020-01-04 23:04:42 +01:00
2020-08-30 17:26:18 +02:00
2020-05-20 18:22:42 +02:00
2019-09-30 12:23:57 +02:00
2020-03-08 15:17:39 +01:00
2017-04-19 13:52:37 +02:00
2020-08-30 16:13:08 +02:00
2020-07-22 13:38:17 +02:00
2020-03-08 19:38:53 +01:00
2019-09-28 01:33:27 +02:00
2020-06-24 15:33:41 +02:00
2019-07-21 22:32:16 +02:00
2020-01-04 23:04:42 +01:00
2020-06-24 15:33:41 +02:00
2020-06-24 15:33:41 +02:00
2020-07-07 15:58:45 +02:00
2020-09-02 18:42:50 +02:00
2019-07-08 12:03:45 +02:00
2019-08-19 21:49:35 +02:00
2019-09-28 01:33:27 +02:00
2020-08-12 00:00:42 +02:00
2020-07-07 15:26:51 +02:00
2019-08-19 21:49:35 +02:00
2020-01-24 14:37:06 +01:00
2019-09-30 12:23:57 +02:00
2020-06-24 15:33:41 +02:00
2019-08-19 21:49:35 +02:00
2020-06-24 15:33:41 +02:00
2020-07-15 15:32:40 +02:00