Merge branch 'master' into frontend

Conflicts: core/lib/Thelia/Config/Resources/config.xml
2013-10-22 11:55:58 +02:00
parent 945471dd8a cb0619a7b3
commit 9d5aa5e077
118 changed files with 3694 additions and 912 deletions
--- a/web/phpinfo.php
+++ b/web/phpinfo.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Created by JetBrains PhpStorm.
+ * Date: 15/10/13
+ * Time: 11:37
+ * 
+ * @author Guillaume MOREL <gmorel@openstudio.fr>
+ */
+
+phpinfo();