Aldin Duraki d949f57a87 Merge branch 'development' into 36-runde-beenden-mit-berechnetem-angriff
# Conflicts:
#	GoldWars/GoldWars/Entities/Base.swift
#	GoldWars/GoldWars/Entities/EntityManager.swift
#	GoldWars/GoldWars/MatchmakingHelper.swift
2020-05-15 17:14:43 +02:00
..