Merge branch 'master' into 014_track_talents

2021-01-07 00:00:36 +01:00 · 2021-01-07 00:00:36 +01:00 · b582b44f20
commit b582b44f20
parent 5bd43125f9 80da77b2e6
16 changed files with 222 additions and 81 deletions
--- a/src/ds4.scss
+++ b/src/ds4.scss
@ -21,4 +21,5 @@
    @import "scss/components/character_values";
    @import "scss/components/attributes_traits";
    @import "scss/components/combat_values";
+    @import "scss/components/character_progression";
 }