Cura/resources/texts
Ghostkeeper b3c03b8771
Merge branch 'master' into libArachne_rebased
Conflicts:
	resources/texts/change_log.txt -> 4.9 got added while we added the Arachne change log as well. I put 4.9 below the Arachne info.
2021-04-08 13:49:52 +02:00
..
whats_new Changelog and whats new 2021-04-02 16:55:56 +02:00
change_log.txt Merge branch 'master' into libArachne_rebased 2021-04-08 13:49:52 +02:00