diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-17 15:43:12 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-17 15:43:12 +0100 |
| commit | f6a4493a587ae7b5cf1bdf8805c973739b4411ea (patch) | |
| tree | 370ceaf617e5b8449dcfd040c7d87d1548c62346 /spec/models/setting_spec.rb | |
| parent | ec18359c3d1996d3bb4676b826bceda88f5a535f (diff) | |
| parent | 1a1b8170bbb1e8cfd5591a8ea8085de41fa90cc5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/models/setting_spec.rb')
0 files changed, 0 insertions, 0 deletions