Skip to content
Snippets Groups Projects
Commit 78e0e7e5 authored by Armand Bahi's avatar Armand Bahi
Browse files

Squashed 'src/module_extraction/' changes from c3060a52..379bc754

379bc754 Resolve conflicts
eec37365 Pull subtrees
3ae7b969 Squashed 'src/vitis/' changes from 25238a11..40e7d46e
ed9c5487 Merge branch 'next_version'
1d4a46b7 Squashed 'src/vitis/' changes from 7a1818a4..25238a11
c3b38dae Squashed 'src/vitis/' changes from 7a1818a4..25238a11
c987d4bf Merge branch 'master'
74d1deff Correction SQL
c0aa5ad8 Ajout du sendMail si le contrôle échoue
31c647a1 Déplacement du fichier et récupération du format pour le contrôle
ab25bc66 Correction pour l'insert order de qualigéo
4dabc6a9 Modification des paramètres de lancement du contrôle
c28fb7ab Changement d'état bloqué si mauvais fichier dépôsé
c3301a7a Ajout dossier Storage et du template de mail
6ace8202 Auto stash before merge of "next_version" and "origin/next_version"
0f046d43 Ajout des configurations
637356ba Dépôt interdit si mauvaise extension
6482d93a Correction d'anomalie sur les require_once
abc29d47 Mise à jour des require_once
f15e264f Squashed 'src/vitis/' content from commit 7a1818a4
fa99d328 Merge branch 'master' into next_version
d00f8cbd Update from SVN

git-subtree-dir: src/module_extraction
git-subtree-split: 379bc7541bf96da829a6b325a511f61bb75c0374
parent ccc27958
No related branches found
No related tags found
Loading
Showing
with 2161 additions and 483 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment