Commit graph

5 commits

Author SHA1 Message Date
Sally Coolatta
4ab8b07fbc Merge assets/README.txt 2020-08-06 10:23:22 -04:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
MascaraSnake
c0bc5f7c5a Minor changes to the readme 2019-12-07 00:11:57 +01:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
mazmazz
4cf48536b9 Add README and LICENSE for installs 2018-11-22 07:41:35 -05:00