about summary refs log tree commit diff
path: root/app/controllers/activitypub/collections_controller.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-28 18:35:25 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-28 18:35:25 +0100
commitce7d055d3cc7927a597c8bb56b45f8e0aae91319 (patch)
tree4ba415e02d601654867889da11391b509909635d /app/controllers/activitypub/collections_controller.rb
parentbb316faffff7a76bc89f7e942233f0e14caf60f5 (diff)
parent58667072d9923b17c90543550294aa9f801103d7 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/activitypub/collections_controller.rb')
0 files changed, 0 insertions, 0 deletions