• Clément Damiens's avatar
    Merge branch 'master' · d75512f8
    Clément Damiens authored
    Conflicts:
    	CustomModule.php
    	assets/font/custom/ctc/fengardoneue_black-webfont.ttf
    	assets/font/custom/ctc/fengardoneue_regular-webfont.ttf
    	assets/ico/favicon.ico
    	assets/ico/lesPepitesEss/favicon.ico
    	assets/images/custom/csc/Logo-header-CSCLG.png
    	assets/images/custom/csc/banniere_logo.jpg
    	assets/images/custom/csc/csc_banniere.jpg
    	assets/images/custom/csc/logo-arbrisseau.jpg
    	assets/images/custom/csc/logo-banniere.png
    	assets/images/custom/csc/logo-fabrique-du-sud.png
    	assets/images/custom/csc/logo-feder.jpg
    	assets/images/custom/csc/logo-mcr.png
    	assets/images/custom/csc/logo-projet.png
    	assets/images/custom/csc/lsi.png
    	assets/images/custom/ctc/banner_ctc.png
    	assets/images/custom/ctc/default_directory.png
    	assets/images/custom/ctc/partenaires_pacte.png
    	assets/images/custom/hva/banniere.jpg
    	assets/images/custom/hva/technopole.jpg
    	assets/images/custom/lesPepitesEss/banner.png
    	assets/images/custom/lesPepitesEss/default_directory.png
    	assets/js/default/directory.js
    	views/custom/csc.php
    	views/custom/ctc.php
    	views/custom/hva.php
    	views/custom/laRaffinerie.php
    	views/custom/leport.php
    	views/custom/lesPepitesEss.php
    d75512f8