Merge pull request #19 from centreon/master

Master
jben94 · Jun 21, 2018 · 71e1f8e · 71e1f8e
2 parents e4edc56 + 66e2730
commit 71e1f8e
Show file tree

Hide file tree

Showing 726 changed files with 43,618 additions and 50,343 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,10 @@
 nbproject/
 /vendor/
 composer.lock
+GPL_LIB/SmartyCache/*
+www/install/tmp/*
+!www/img/media/.keep
+www/img/media/*
+!www/install/tmp/.gitkeep
+www/install/install.conf.php
+config/centreon.config.php
diff --git a/GPL_LIB/Smarty/BUGS b/GPL_LIB/Smarty/BUGS
diff --git a/GPL_LIB/Smarty/COPYING.lib b/GPL_LIB/Smarty/COPYING.lib
diff --git a/GPL_LIB/Smarty/ChangeLog b/GPL_LIB/Smarty/ChangeLog
diff --git a/GPL_LIB/Smarty/FAQ b/GPL_LIB/Smarty/FAQ
diff --git a/GPL_LIB/Smarty/INSTALL b/GPL_LIB/Smarty/INSTALL