diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-02-28 21:35:53 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-02-28 21:35:53 +0100 |
| commit | 2267eee356a3d2b8ebb20892c5182b6f8169403e (patch) | |
| tree | 015d70b4b633fadf70cab9d0a0b0fbd55e6456ae /spec/controllers/settings | |
| parent | 76ed481aa7b67d624675cdaa85bac583853fd24d (diff) | |
| parent | ee7d79c0ce411ff7754e3ac31dbf27cb9e298f73 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/controllers/settings')
0 files changed, 0 insertions, 0 deletions