diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-13 16:28:07 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-13 16:28:07 +0100 |
| commit | bfe2b9cc501205a07628b59b0a38a8643a4ca11c (patch) | |
| tree | 78fa8ee6336dca2719ab0775b81ff98fe34808c6 /app/controllers/settings/base_controller.rb | |
| parent | 2fe0cb16239ed86016ebea352425862a561b63a2 (diff) | |
| parent | c875f19673e923e7a6e3c2b6656e96b863ca5915 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/settings/base_controller.rb')
0 files changed, 0 insertions, 0 deletions