ajout des confs apache et nginx
Merge branch 'master' of https://github.com/exaprint/expedito
Merge remote-tracking branch 'origin/master'
Ajout de la configuration imprimante pour Marie
Merge remote-tracking branch 'origin/master'