ynerant 451dd9cba7 Merge branch 'master' into 'equipment' ... # Conflicts: # squirrelbattle/display/statsdisplay.py # squirrelbattle/entities/items.py # squirrelbattle/entities/player.py # squirrelbattle/interfaces.py # squirrelbattle/locale/de/LC_MESSAGES/squirrelbattle.po # squirrelbattle/locale/es/LC_MESSAGES/squirrelbattle.po # squirrelbattle/locale/fr/LC_MESSAGES/squirrelbattle.po # squirrelbattle/tests/game_test.py		2021-01-08 02:11:40 +01:00
..
LC_MESSAGES	Merge branch 'master' into 'equipment'	2021-01-08 02:11:40 +01:00