LUCASTUCIOUS b8786b2f47 Merge branch 'develop' into feature/bookdisplay ... # Conflicts: # data/spells/spells-grimoire-fr.json # index.html # spells.html		2023-03-12 14:58:00 +01:00
..
spells	Merge branch 'develop' into feature/bookdisplay	2023-03-12 14:58:00 +01:00