diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 21:18:27 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-23 21:18:27 +0200 |
commit | bf988123bad3c5341941376c946421c8e3fb4700 (patch) | |
tree | c4e8baef309e1fe08fccdd66bf6aa8de6f36fb97 /app/lib/settings/extend.rb | |
parent | c394d3cb25ad39f169fbf45d18153a51d34c43ad (diff) | |
parent | 9a5561a5b87e57fae0333a025b8ef42aaab6ce0f (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib/settings/extend.rb')
0 files changed, 0 insertions, 0 deletions