GiuseppeS e51c8a73ce Merge tag 'Hotfix-BuildFrudis' into develop
Finish Hotfix-BuildFrudis

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	.idea/runConfigurations/app.xml
2019-09-12 12:45:25 +02:00
..
2019-09-12 12:44:38 +02:00
2019-01-09 17:01:33 +01:00
2018-03-28 11:46:26 +02:00