Joshua Barretto f479231b15 Merge branch 'glowy-shiny-pretty' into 'master' ... Glowy shiny pretty See merge request veloren/veloren!1874		2021-03-11 17:37:33 +00:00
..
common	Auras will now refresh buffs if a buff was already present that had a lesser duration.	2021-03-09 18:03:06 -05:00
voxygen	Merge branch 'glowy-shiny-pretty' into 'master'	2021-03-11 17:37:33 +00:00
world	Sarrakitty/small fixes	2021-02-08 20:37:24 +00:00