2d4ff8f6ed
Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Upstream split some `simple_form` arguments across multiple lines. One of the arguments in glitch-soc was different. Split as upstream's did, keeping our different limit argument. - `app/views/admin/settings/appearance/show.html.haml`: Upstream split some `simple_form` arguments across multiple lines. Glitch-soc had a different field because of the different theming system. Kept glitch-soc's definition of that form field. |
||
|---|---|---|
| .. | ||
| chewy | ||
| controllers | ||
| helpers | ||
| javascript | ||
| lib | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| serializers | ||
| services | ||
| validators | ||
| views | ||
| workers | ||