Create composer.json
Update composer.json
Update composer.json
Delete composer.json
Create composer.json
MAJ de test.php
Merge branch '1.0' of https://github.com/linconnu/repository-test into dev
remplacement d'echo 'test' par echo 'titi'
changement de titi en TITI
rien de special
retrait d'un saut de ligne inutile
Merge branch '1.0' of https://github.com/linconnu/repository-test into 1.0

Conflicts:
	test.php