dd2a991e24
Conflicts: - `app/javascript/material-icons/400-24px/code.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/mail.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/manufacturing.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/views/admin/settings/shared/_links.html.haml`: Glitch-soc had extra menu items, ported the changes for them too. - `config/navigation.rb`: Glitch-soc had extra menu items, ported the changes for them too. |
||
|---|---|---|
| .. | ||
| chewy | ||
| config/initializers/rack | ||
| controllers | ||
| fabrication | ||
| fabricators | ||
| fixtures | ||
| generators | ||
| helpers | ||
| lib | ||
| locales | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| requests | ||
| routing | ||
| search/models/concerns/account | ||
| serializers | ||
| services | ||
| support | ||
| system | ||
| validators | ||
| views | ||
| workers | ||
| flatware_helper.rb | ||
| rails_helper.rb | ||
| spec_helper.rb | ||