Bring dev into master finally

EnAppelsin / SHARCarRandomiser

Randomiser Mod for Simpsons Hit & Run

https://enappelsin.github.io/SHARCarRandomiser/

14 stars 6 forks source link

Bring dev into master finally #60

Closed EnAppelsin closed 3 years ago

EnAppelsin commented 3 years ago

Summary of changes

Bring dev into master

Description of changes

Dev has been more stable than master for ages now and most new work is on the seeding branch. It's time to move dev to master and seeding to dev (and maybe do more, idk yet)

Any additional information

This is to remind myself later to start looking at the merge conflicts

Hampo commented 3 years ago

Fixed the conflict - it was a single full stop on README.md.