diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-17 20:16:24 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-17 20:16:24 +0200 |
| commit | 81e49ba5c6107927d12bd222b7081f63ba63bdc9 (patch) | |
| tree | d88e34d9a103f23b7ab568e92bd9b2e6ab679a47 /app/controllers/api/web/settings_controller.rb | |
| parent | 5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (diff) | |
| parent | 89077fb65713ece348fdbee1986d1593383ba801 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/api/web/settings_controller.rb')
0 files changed, 0 insertions, 0 deletions