Merge branch 'master' into 'master'

SUBMODULE: Update assets submodule

See merge request veloren/veloren!18

Former-commit-id: 11720bf5b96cc41b9e1141db7fa21710905bba0e
This commit is contained in:
Joshua Barretto 2019-04-10 22:13:17 +00:00
commit 5bba91039f

@ -1 +1 @@
Subproject commit 6f92281730bb1eb26841053c78a1354a4321ff5a
Subproject commit e3083ec8e8e634af8c9daed00ea82435da195979