Merge branch 'dev'

#Conflicts:
#	index.html
This commit is contained in:
neon443
2024-10-05 18:44:27 +01:00
348 changed files with 32644 additions and 4 deletions

View File

@@ -66,7 +66,10 @@
<img src="./images/slope/icon.png" alt="App Icon">
<span class="label">Slope</span>
</a>
<a href="https://neon443.github.io/sandspiel/" class="app">
<a href="./games/run3/" class="app">
<img src="./images/run3/icon.png" alt="App Icon">
<span class="label">Run 3</span>
</a> <a href="./games/run3/" class="app">
<img src="./images/sandspiel/icon.png" alt="App Icon">
<span class="label">Sandspiel</span>
</a>
@@ -76,8 +79,21 @@
</a>
</div>
<h3><b>News</b></h3>
<<<<<<< HEAD
<p>The redesign everyone has been waiting for is now here!</p>
<p><b>New Game:</b> Champion Island Google Doodle</p>
=======
<div class="indented">
<p>
The redesign everyone has been waiting for is now here!
</p>
<h4>New Games</h4>
<p class="indented">
05/10/2024 Run 3<br/>
28/09/2024 Google Doodle Champion Island
</p>
</div>
>>>>>>> dev
</div>
<footer>
<h5 class="center">Made with &#60;&#47;&#62; by neon443</h5>