Christof Petig a09637c80d Merge branch 'master' into 'weblate-translation'
# Conflicts:
#   assets/voxygen/i18n/uk/buff.ftl
#   assets/voxygen/i18n/uk/common.ftl
#   assets/voxygen/i18n/uk/hud/settings.ftl
2023-08-28 19:43:06 +00:00
..
2023-08-19 11:44:58 +02:00
2023-06-27 21:37:19 +02:00
2023-08-03 19:32:09 +02:00
2022-12-31 15:32:56 +00:00
2023-08-27 19:40:49 +02:00
2023-08-09 20:44:51 +00:00
2021-04-11 16:35:25 +02:00