DeliveryActivity complete
DeliveryActivity complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of C:\Users\Luc\AndroidStudioProjects\LivrExpress\LivrExpress with conflicts.
dernier commit vendredi soir gne