diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-09-07 09:21:38 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-09-07 09:21:38 +0200 |
| commit | e5f934ddf0aa4ef9efbf45751bc00bebff768d99 (patch) | |
| tree | 322231d7d50704edf8da762b69ee22c9850f2ce3 /app/helpers | |
| parent | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (diff) | |
| parent | a6121a159c5305ea9faa95743a50babb23ab41cd (diff) | |
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.
Diffstat (limited to 'app/helpers')
0 files changed, 0 insertions, 0 deletions