Noé Lopez f2b9d15373 Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/css/resources.scss # src/js/game/hud/parts/buildings_toolbar.js # src/js/game/meta_building_registry.js # src/js/game/systems/item_processor.js # translations/base-en.yaml		2020-09-23 18:49:45 +02:00
..
css	Merge remote-tracking branch 'origin/master'	2020-09-23 18:49:45 +02:00
html	Improve UX for first levels	2020-06-01 20:18:50 +02:00
js	Merge remote-tracking branch 'origin/master'	2020-09-23 18:49:45 +02:00