diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-22 21:35:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 21:35:07 +0200 |
| commit | 8aa58e34bb2b62192a997ac7ea8919b22fc45f80 (patch) | |
| tree | abc0ea9862c55c2e114c855b20eb4a35f1141709 /spec/helpers/settings_helper_spec.rb | |
| parent | 628fca50e20bcf41f206877083fc5ee8789c1088 (diff) | |
| parent | e70fc059a9511d43b42c2502514f6220b416cdd5 (diff) | |
Merge pull request #665 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/helpers/settings_helper_spec.rb')
0 files changed, 0 insertions, 0 deletions