Merge remote-tracking branch 'origin/char-file' into char-file

Browse Source

# Conflicts:
#	bonemarketsolver/data/appendages.py
#	bonemarketsolver/data/embellishments.py

...

This commit is contained in:

TheTaques 2021-08-24 14:03:44 +02:00

parent 6df8cb461c b002ca6e96

commit dee14ddf06

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available