Merge branch 'master' into develop

This commit is contained in:
Harrison Deng 2022-01-22 14:49:32 -06:00
commit 1a3ca5a67e
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@
>
<div class="title">
<h1>RSEMCS</h1>
<p>Reslate Systems - Entertainment: Minecraft Server, or RSEMCS (for brevity, of course), a the private survival Minecraft server. There is an overall objective to keep the server close to vanilla however with a few minor tweaks.</p>
<p>Reslate Systems - Entertainment: Minecraft Server, or RSEMCS (for brevity, of course), is a private survival Minecraft server. There is an overall objective to keep the server close to vanilla however with a few minor tweaks.</p>
</div>
<div class="content">
<h2>Status</h2>

View File

@ -36,7 +36,7 @@
>
<div class="title">
<h1>What is this?</h1>
<p>This is the web interface for Reslate Entertainment Systems. This is <b>not</b> a public service and you may be on this page by mistake. Alternatively, you may be this page completely intentionally!</p>
<p>This is the web interface for Reslate Entertainment Systems. This is <b>not</b> a public service and you may be on this page by mistake. Alternatively, you may be on this page completely intentionally!</p>
</div>
</div>
</div>