about summary refs log tree commit diff
path: root/app/controllers/api/web/base_controller.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-08-20 10:33:24 +0200
committerThibaut Girka <thib@sitedethib.com>2019-08-20 10:33:24 +0200
commitdf150da4355bb224913f6de2940c9135714fb53f (patch)
tree0301dfdea48280c3942fc00da2d478f9360c148c /app/controllers/api/web/base_controller.rb
parent1d40325e7c9f8f380d4bb2ac55beedfb1bef5009 (diff)
parent97af209c3113926534fe8c5adb7ad51fa4527cbe (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/initializers/content_security_policy.rb
  (took our version)
Diffstat (limited to 'app/controllers/api/web/base_controller.rb')
0 files changed, 0 insertions, 0 deletions