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
..
2019-03-27 15:55:23 +01:00
2020-06-02 19:24:53 +02:00
2020-09-02 18:42:50 +02:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2020-09-02 02:11:12 +02:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2020-06-02 19:24:53 +02:00
2019-07-10 00:43:30 +02:00
2020-06-02 19:24:53 +02:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2020-09-02 02:11:12 +02:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2019-09-19 20:58:19 +02:00
2020-08-04 19:43:19 +02:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2020-06-02 19:24:53 +02:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00
2019-06-27 19:41:55 +02:00
2019-03-27 15:55:23 +01:00
2019-03-27 15:55:23 +01:00