diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-18 10:54:12 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-18 10:54:12 -0600 |
| commit | d3f64812a695788cda5d168ff10c666ffbdab339 (patch) | |
| tree | 1f6876a3588af04f454686134ac1bd6a12a019e2 /config/settings.yml | |
| parent | 708ec07e27dd02d03f2d155bcc61ae8de4c10c4a (diff) | |
| parent | fe6663ef504f5c8541e05c92bfd08c6a466b1a67 (diff) | |
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
Conflicts: app/javascript/styles/win95.scss config/themes.yml
Diffstat (limited to 'config/settings.yml')
0 files changed, 0 insertions, 0 deletions