Sergeanur e373d0526e Merge branch 'master' into MoreLanguages
# Conflicts:
#	src/core/Frontend.cpp
#	src/render/Font.cpp
#	src/render/Hud.cpp
#	src/render/Hud.h
#	src/text/Messages.cpp
#	src/text/Text.cpp
2020-04-15 00:10:50 +03:00
..
2020-04-09 20:50:24 +02:00
2019-10-21 02:41:15 +03:00
2020-04-09 20:50:24 +02:00
2020-04-09 20:50:24 +02:00
2020-04-09 20:50:24 +02:00
2019-10-20 20:31:59 +03:00