Onglet
corrigé ?
Merge branch 'master' of
https://github.com/Zellfenix/JADE_SMA_Commercial.git
ignore
Merge branch 'master' of
https://github.com/Zellfenix/JADE_SMA_Commercial.git

Conflicts:
	JADE_SMA_Commercial/APDescription.txt
	JADE_SMA_Commercial/MTPs-Main-Container.txt
Merge branch 'master' of https://github.com/Zellfenix/JADE_SMA_Commercial.git
Merge branch 'master' of
https://github.com/Zellfenix/JADE_SMA_Commercial.git

Conflicts:
	JADE_SMA_Commercial/.gitignore