eichhornchen 196e3708d2 Merge branch 'master' into 'doc' ...

# Conflicts:
#   squirrelbattle/entities/items.py
#   squirrelbattle/interfaces.py

2021-01-08 11:10:09 +01:00

..

__init__.py

Declare the license, we use GNU GPL

2020-11-27 16:33:17 +01:00

friendly.py

linting

2020-12-31 15:00:20 +01:00

items.py

Merge branch 'master' into 'doc'

2021-01-08 11:10:09 +01:00

monsters.py

Merge branch 'master' into 'equipment'

2021-01-08 02:11:40 +01:00

player.py

Fix merge

2021-01-08 02:15:13 +01:00