Forest Anderson 3dd26fecc8 Merge branch 'master' into 'master'
Fixes match pattern code that rendered an actionable branch unreachable.

See merge request veloren/veloren!120

Former-commit-id: 06bcf5a6caf32fa80576d56766571c7f9ce7d54d
2019-05-12 20:40:09 +00:00
..
2019-05-12 20:40:09 +00:00
2019-05-09 18:57:47 +01:00