Closed polyamAdmin closed 2 months ago
Conflicts:
app/javascript/flavours/glitch/styles/index.scss
application.scss
Ported changes:
Conflicts:
app/javascript/flavours/glitch/styles/index.scss
Upstream moved imports toapplication.scss
. Polyam-glitch had an extra import for syntax highlighting. Moved extra import.Ported changes: