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

..

advanced_settings_en.md

Merge branch 'main' into docs_consolidation

2022-01-17 15:37:03 -05:00

commands_en.md

WebHost: Address PR feedback and run another reformat.

2022-01-09 15:12:36 -05:00

plando_en.md

Merge branch 'main' into docs_consolidation

2022-01-17 15:37:03 -05:00

setup_en.md

WebHost: Undo all softwrapping changes because people don't like it. Fair enough!

2021-12-31 14:12:22 -05:00

triggers_en.md

Merge branch 'main' into docs_consolidation

2022-01-17 15:37:03 -05:00

using_website_en.md

WebHost: Undo all softwrapping changes because people don't like it. Fair enough!

2021-12-31 14:12:22 -05:00