c04f2d0cf7
Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes. |
||
|---|---|---|
| .. | ||
| statuses | ||
| _filter.html.haml | ||
| _filter_fields.html.haml | ||
| _keyword_fields.html.haml | ||
| edit.html.haml | ||
| index.html.haml | ||
| new.html.haml | ||