Hussein Farran 9599f54b06 Merge branch 'main' into docs_consolidation ... # Conflicts: # WebHostLib/static/assets/tutorial/archipelago/advanced_settings_en.md # WebHostLib/static/assets/tutorial/archipelago/plando_en.md # WebHostLib/static/assets/tutorial/archipelago/triggers_en.md # WebHostLib/static/assets/tutorial/timespinner/setup_en.md		2022-01-17 15:37:03 -05:00
..
assets	Merge branch 'main' into docs_consolidation	2022-01-17 15:37:03 -05:00
static	WebHost: remove outdated data	2021-12-04 22:12:09 +01:00
styles	[WebHost] weighted-settings: Minor style fixes	2022-01-11 04:33:27 -05:00