diff options
| author | ThibG <thib@sitedethib.com> | 2019-12-01 13:13:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-01 13:13:28 +0100 |
| commit | 7d59e25fbd7a0209c11cbe6aac4400bbca4de82b (patch) | |
| tree | fc21c09cd6e0e8a666655df8b7f6802745a7e473 /spec/models/setting_spec.rb | |
| parent | 7f6315841c98a1eee6cb57171a91a88f5c5343df (diff) | |
| parent | fae7e0cacec60094dc1ce78d9f63b19b1cacde2d (diff) | |
Merge pull request #1250 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models/setting_spec.rb')
0 files changed, 0 insertions, 0 deletions