version 8.4.0

This commit is contained in:
fredtempez 2018-11-13 17:44:06 +01:00
parent 88794b38df
commit ca8c4a4362
1 changed files with 5 additions and 6 deletions

11
.gitignore vendored
View File

@ -1,4 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
# Fichiers temporaires
site/tmp/*
@ -11,19 +11,18 @@ site/data/*
# Fichiers uploadés
site/file/source/*
site/file/thumb/*
=======
# Fichiers de données
site/*
>>>>>>> 8.3.14
# Dossiers vides dans GitHub
!.gitkeep
# PHPStorm
.idea/
<<<<<<< HEAD
=======
#Visual Code
.vscode
>>>>>>> 8.3.14