|
4f22068de9
|
Merge branch 'Recommendet-Settings'
# Conflicts:
# archive/deaflora/Backgroundmusic/Villages/Party.md
# archive/deaflora/Characters/Player 1.md
# archive/deaflora/Characters/Player 2.md
# archive/deaflora/Characters/Player 3.md
# archive/deaflora/Characters/Player 4.md
# archive/deaflora/Characters/Player 5.md
# archive/deaflora/Places/Overworld.map
# archive/deaflora/README.md
# archive/deaflora/Story/Encounters/The Forest/Goblins.md
# archive/deaflora/Story/Levels of Flowering.md
# archive/deaflora/Story/Mainquest/0_Mainstory.md
# archive/deaflora/Story/Mainquest/MQ_001_Zauberersuche.md
# archive/deaflora/Story/Sidequests/SQ_001_Zutatensuche.md
# archive/deaflora/Story/Sidequests/TEMPLATE.md
# archive/deaflora/homerules.md
|
2022-05-11 14:01:57 +02:00 |
|