about summary refs log tree commit diff
path: root/app/controllers/oauth
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-23 11:28:28 +0100
committerThibaut Girka <thib@sitedethib.com>2018-12-23 11:28:28 +0100
commit3e686beaea1931c76c778d8ca6b03c41caaf69db (patch)
treef659a52ba0245daf2c7776e63c3a5012f906552a /app/controllers/oauth
parent1a3088364fe602bb48647d78dda440b174424e17 (diff)
parente25947db4a44cd50fa1daa36d5031a950327b646 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
Diffstat (limited to 'app/controllers/oauth')
0 files changed, 0 insertions, 0 deletions