0
0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-06-26 19:41:22 +02:00
doodle3d-firmware/src/FIRMWARE-VERSION
peteruithoven 468af0e604 Merge branch 'develop'
Conflicts:
	ReleaseNotes.md
	src/FIRMWARE-VERSION
	src/util/settings.lua
2014-01-02 13:30:59 +01:00

6 lines
51 B
Plaintext

<<<<<<< HEAD
0.9.12
=======
0.9.13
>>>>>>> develop