Igor Scheller f201b2f1c8 Merge branch 'feature-bootstrap5' ... # Conflicts: # package.json # tests/Unit/Renderer/Twig/Extensions/GlobalsTest.php # webpack.config.js # yarn.lock		2021-08-17 14:26:28 +02:00
..
icons	Replaced angel icons with svg	2018-10-30 22:50:22 +01:00
js	Merge branch 'feature-bootstrap5'	2021-08-17 14:26:28 +02:00
themes	Fix secondary color on dark themes and theme 7 secondary buttons, formatting	2021-08-16 18:02:06 +02:00