Merge branch 'master' into 'beta'

Correct typo

See merge request !117

htdocs/3step.html

@@ -47,7 +47,7 @@
 				<div class="card mb-4">
 					<div class="card-body">
 						<h5 class="card-title">💬</h5>
-						<p class="card-text">3. Jon the conversation</p>
+						<p class="card-text">3. Join the conversation</p>
 						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
 					</div>
 				</div>