GitLab

up up panel admin costum

Incredible merge  delete all i do

maisd alors bien comme il faut 

fuck da mergeeeeeeeeeee

default path co2 directory img default

again merge abort failed 

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

Revert "Merge branch 'development' into 'master'"

See merge request !991

This reverts merge request !990

Ajout du custom Mocica

See merge request pixelhumain/co2!990

clean co2 with custom migrated in costum

redirect custom to costum

fix notifs

up home