Chris Adderley f1d01c3a60 Resolve changelog conflicts ... # Conflicts: # Distribution/Restock/changelog.txt # Distribution/RestockPlus/changelog.txt		2020-04-26 13:50:50 -07:00
..
Assets	blarblarbalrblar	2020-04-22 10:43:43 -07:00
FX	Compress nert parts to dds	2019-10-20 13:23:21 -07:00
Localization	- Add localization descriptions for the 5m RS+ fuel tanks.	2020-04-25 21:31:41 +01:00
Parts	Resolve changelog conflicts	2020-04-26 13:50:50 -07:00
Patches	- The big COVID-19-Isolation-time config clean-up.	2020-04-25 16:53:46 +01:00
Versioning	A multitude of bugfixes.	2020-02-15 22:54:22 -08:00