diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-15 18:02:45 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-15 18:02:45 +0100 |
| commit | 06cc04fd239896d294210b8bbaadb7c611aaffe5 (patch) | |
| tree | 1868711bbe9ee79b25ff10a585457cfa0f9ac121 /spec/models/setting_spec.rb | |
| parent | 2769b5446681898e8332cb505f499dac2a6e5717 (diff) | |
| parent | 8ef50706a11e115e8b4aa31b30de93738bc7e754 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/models/setting_spec.rb')
0 files changed, 0 insertions, 0 deletions