Merge branch 'develop' into gsouquet/message-bubbles-4635

2021-07-13 10:15:27 +02:00
parent 1061cb0ffb 199c80315e
commit ba3e7e24ba
151 changed files with 1395 additions and 984 deletions
--- a/res/themes/light/css/light.scss
+++ b/res/themes/light/css/light.scss
@@ -4,3 +4,4 @@
@import "_light.scss";
@import "_mods.scss";
@import "../../../../res/css/_components.scss";
+@import url("highlight.js/styles/atom-one-light.css");