- 21 Feb, 2019 2 commits
-
-
- 20 Feb, 2019 1 commit
-
-
alex authored
-
- 18 Feb, 2019 1 commit
-
-
alex authored
-
- 16 Feb, 2019 2 commits
-
-
Clément Damiens authored
up up panel admin costum
-
Clément Damiens authored
Incredible merge delete all i do
-
- 15 Feb, 2019 10 commits
-
-
Clément Damiens authored
maisd alors bien comme il faut
-
Clément Damiens authored
fuck da mergeeeeeeeeeee
-
Clément Damiens authored
default path co2 directory img default
-
Clément Damiens authored
again merge abort failed
-
Clément Damiens authored
-
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
-
Raph El authored
Revert "Merge branch 'development' into 'master'" See merge request pixelhumain/co2!991
-
Clément Damiens authored
Ajout du custom Mocica See merge request pixelhumain/co2!990
-
Clément Damiens authored
clean co2 with custom migrated in costum
-
- 14 Feb, 2019 2 commits
-
-
Clément Damiens authored
redirect custom to costum
-
Jean-Baptiste HUBER authored
-
- 13 Feb, 2019 12 commits
- 12 Feb, 2019 1 commit
-
-
Clément Damiens authored
-
- 11 Feb, 2019 3 commits
- 08 Feb, 2019 4 commits
-
-
Clément Damiens authored
-
Clément Damiens authored
-
-
Raph El authored
-
- 07 Feb, 2019 2 commits
-
-
Clément Damiens authored
up home
-
Clément Damiens authored
-