Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's different theming system. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||
Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's different theming system. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.jsx | ||