2018-11-13 13:36:39 +01:00
|
|
|
<<<<<<< HEAD
|
2018-09-09 16:29:52 +02:00
|
|
|
# Fichiers temporaires
|
|
|
|
|
site/tmp/*
|
|
|
|
|
|
|
|
|
|
# Sauvegardes
|
|
|
|
|
site/backup/*
|
|
|
|
|
|
|
|
|
|
# Fichiers de données
|
|
|
|
|
site/data/*
|
|
|
|
|
|
|
|
|
|
# Fichiers uploadés
|
|
|
|
|
site/file/source/*
|
|
|
|
|
site/file/thumb/*
|
2018-11-13 13:36:39 +01:00
|
|
|
=======
|
2018-10-23 21:24:09 +02:00
|
|
|
# Fichiers de données
|
2018-10-06 05:46:07 +02:00
|
|
|
site/*
|
2018-11-13 13:36:39 +01:00
|
|
|
>>>>>>> 8.3.14
|
2018-09-09 16:29:52 +02:00
|
|
|
|
|
|
|
|
# Dossiers vides dans GitHub
|
|
|
|
|
!.gitkeep
|
|
|
|
|
|
|
|
|
|
# PHPStorm
|
|
|
|
|
.idea/
|
2018-11-13 13:36:39 +01:00
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
2018-10-23 21:24:09 +02:00
|
|
|
|
|
|
|
|
#Visual Code
|
|
|
|
|
.vscode
|
2018-11-13 13:36:39 +01:00
|
|
|
>>>>>>> 8.3.14
|
