Merge branch 'master' of ateliers.heureux-cyclage.org:lhc/ateliers

diff --git a/etc/gitolite b/etc/gitolite
index 132556f..e40e40a 160000 (submodule)
--- a/etc/gitolite
+++ b/etc/gitolite
@@ -1 +1 @@
-Subproject commit 132556f65d436a37502040817318d429d16c2ca7
+Subproject commit e40e40a0ee138d09935796b708ef9be1f7cbbd3a

diff --git a/etc/php5/fpm/pool.d/cyclo_www/php-fpm.conf b/etc/php5/fpm/pool.d/cyclo_www/php-fpm.conf
index 9fa314b..7f7fc2c 100644 (file)
--- a/etc/php5/fpm/pool.d/cyclo_www/php-fpm.conf
+++ b/etc/php5/fpm/pool.d/cyclo_www/php-fpm.conf
@@ -1,5 +1,6 @@
-php_admin_value[extension] = pdo_mysql.so
+php_admin_value[extension] = curl.so
 php_admin_value[extension] = mysqli.so
+php_admin_value[extension] = pdo_mysql.so
 pm.max_children = 15
 pm.max_requests = 200
 pm.max_spare_servers = 5