Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history 
# Conflicts:
#	dist/en/base-game.json
#	dist/index.json
#	src/cards/en/base-game.yml
  • Loading branch information
@BixelPitch
BixelPitch committed Dec 26, 2020
2 parents 6cca9e8 + eca0144 commit 6a43277
Show file tree
Hide file tree
Showing 4 changed files with 1,257 additions and 76 deletions.
Loading

0 comments on commit 6a43277

Please sign in to comment.