diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-29 13:57:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-29 13:57:56 +0200 |
| commit | c24491a8dfa79e1ca7f48c3b393a9d7b427eb9df (patch) | |
| tree | 748d12024f97e2f6bdd99332d80c99778360179e /app/controllers/application_controller.rb | |
| parent | c4b34791733de5b396a726aeff3f16d349e56c7e (diff) | |
| parent | 702a92629968db91e88b785a7cfdf78998719a20 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/application_controller.rb')
0 files changed, 0 insertions, 0 deletions