diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-19 21:53:44 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-19 21:53:44 +0200 |
| commit | 08a2af27c3353555d729255fc42f6d49af20ed52 (patch) | |
| tree | f163dea0261fa79ca2052cd243ec9ac502b53cd2 /spec/controllers/settings/preferences_controller_spec.rb | |
| parent | 46811f92e4b1705da5bb52e0e9e4e9e59ea1a15e (diff) | |
| parent | ae1838655876363065dd062a21064d385a90eb33 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/controllers/settings/preferences_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions