diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-30 13:31:01 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-30 13:31:01 +0200 |
| commit | 06036081a0759b0b5635afa6e6f5d6ed49233add (patch) | |
| tree | 62d7297066efca26f7f00040001374f3c4e2164f /app/controllers/application_controller.rb | |
| parent | 6c0428b7d8bb9a0f5f4ccb68697276d99cf036d8 (diff) | |
| parent | dee4f1878ded9848a302f40a8d7523e32531e8c5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/application_controller.rb')
0 files changed, 0 insertions, 0 deletions