cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6091 from Whitellama/dev

Browse Source 
Fixes issue with changelog merge
This commit is contained in:
Zuhayr
2014-08-21 22:41:15 +09:30
parent a80931a6b9 099f719dc7
commit 013cfa399c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/changelog.html
+9 -5
View File
@@ -126,6 +126,15 @@ should be listed in the changelog upon commit though. Thanks. -->
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>2 August 2014</h2>
<h3 class='author'>Whitellama updated:</h3>
<ul class='changes bgimages16'>
<li class='bugfix'>Arcane tomes can now be stored on bookshelves.</li>
<li class='bugfix'>Dionaea players no longer crash on death, and now properly nymphs properly.</li>
</ul>
</div>
<div class='commit sansserif'>
<h2 class='date'>31 July 2014</h2>
<h3 class='author'>HarpyEagle updated:</h3>
@@ -142,11 +151,6 @@ should be listed in the changelog upon commit though. Thanks. -->
<ul class='changes bgimages16'>
<li class='rscadd'>Added dynamic flavour text.</li>
<li class='bugfix'>Fixed bug with suit fibers and fingerprints.</li>
<h2 class='date'>2 August 2014</h2>
<h3 class='author'>Whitellama updated:</h3>
<ul class='changes bgimages16'>
<li class='bugfix'>Arcane tomes can now be stored on bookshelves.</li>
<li class='bugfix'>Dionaea players no longer crash on death, and now properly nymphs properly.</li>
</ul>
</div>