Merge remote-tracking branch 'origin/visual-indicators' into visual-indicators

# Conflicts:
#	src/main/java/Controller.java
This commit is contained in:
Jeddunk 2020-08-28 14:40:45 +02:00
commit c224b2168d

Diff Content Not Available