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
..
common	Reliable leather pack	2023-08-09 20:44:51 +00:00
server/manifests	Initial setup	2023-07-29 18:53:38 -04:00
test/loadout/ok	Rebase commit	2022-05-16 15:11:36 -04:00
voxygen	Merge branch 'master' into 'weblate-translation'	2023-08-28 19:43:06 +00:00
world	Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'	2023-08-19 11:12:01 +00:00