diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-28 11:45:13 -0600 |
| commit | 95c270f5b1ffd328345a7b1223f65876f3d88423 (patch) | |
| tree | 621e27e89b238d8806fdd3294009361d0691f49c /app/lib/settings/scoped_settings.rb | |
| parent | 7463d80ff442833a4ad299460f37c27be9b8cda1 (diff) | |
| parent | 15fab79cfa5b732e9d7816f162272d72cf06c733 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/lib/settings/scoped_settings.rb')
0 files changed, 0 insertions, 0 deletions