1. 26 Feb, 2019 13 commits
  2. 25 Feb, 2019 1 commit
  3. 22 Feb, 2019 4 commits
  4. 21 Feb, 2019 5 commits
  5. 20 Feb, 2019 4 commits
  6. 19 Feb, 2019 1 commit
  7. 18 Feb, 2019 2 commits
  8. 16 Feb, 2019 2 commits
    • Clément Damiens's avatar
      · 78736cb5
      Clément Damiens authored
      up up panel admin costum
      78736cb5
    • Clément Damiens's avatar
      · f2b23ab1
      Clément Damiens authored
      Incredible merge  delete all i do
      f2b23ab1
  9. 15 Feb, 2019 8 commits
    • Clément Damiens's avatar
      · 80c3b344
      Clément Damiens authored
      maisd alors bien comme il faut 
      80c3b344
    • Clément Damiens's avatar
      · e9107ec6
      Clément Damiens authored
      fuck da mergeeeeeeeeeee
      e9107ec6
    • Clément Damiens's avatar
      · 21e4b27b
      Clément Damiens authored
      default path co2 directory img default
      21e4b27b
    • Clément Damiens's avatar
      · 6054cc52
      Clément Damiens authored
      again merge abort failed 
      6054cc52
    • Clément Damiens's avatar
      up merge bugillouse · 935130b5
      Clément Damiens authored
      935130b5
    • 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
    • Raph El's avatar
      Merge branch 'revert-7188d7b5' into 'master' · b31b7a6f
      Raph El authored
      Revert "Merge branch 'development' into 'master'"
      
      See merge request pixelhumain/co2!991
      b31b7a6f
    • Raph El's avatar
      Revert "Merge branch 'development' into 'master'" · c338bc6e
      Raph El authored
      This reverts merge request !990
      c338bc6e