diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-01 17:23:46 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-01 17:23:46 +0200 |
| commit | a74a7d5fe30dad5e2e4a3ac5e199ce18db75fe59 (patch) | |
| tree | b3754c8ac02614e821c6680cf31ecb64389aca36 /app/lib/settings/extend.rb | |
| parent | cc7adf7e842b662fafc1eb1a9de3b7a450abbd1a (diff) | |
| parent | 0e661dd2e9f0fb0b87d686bec58782881b054fd9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib/settings/extend.rb')
0 files changed, 0 insertions, 0 deletions