Zach White 1581ea48dc

Fix develop (#12039) ...

Fixes file encoding errors on Windows, and layouts not correctly merging into info.json.

* force utf8 encoding

* correctly merge layouts and layout aliases

* show what aliases point to

2021-02-27 12:00:50 -08:00

..

linux

…

__init__.py

…