arguments
Merge branch 'master' of github.com:ProjetCristallo/Editor
Merge branch 'master' of github.com:ProjetCristallo/Editor

Conflicts:
	editor.ini
Merge branch 'master' of github.com:ProjetCristallo/Editor
l'argument de "salt"