Hussein Farran 75d94b04aa Merge branch 'main' into docs_consolidation ... # Conflicts: # WebHostLib/static/assets/gameInfo/en_Secret of Evermore.md # WebHostLib/static/assets/tutorial/archipelago/advanced_settings_en.md # WebHostLib/static/assets/tutorial/minecraft/minecraft_en.md		2021-12-19 22:53:06 -05:00
..
assets	Merge branch 'main' into docs_consolidation	2021-12-19 22:53:06 -05:00
static	WebHost: remove outdated data	2021-12-04 22:12:09 +01:00
styles	[WebHost] Add Super Metroid support to Web Tracker (#153)	2021-12-14 17:04:24 +01:00