--- a/.hgsubstate Fri Feb 24 10:55:01 2012 +0100
+++ b/.hgsubstate Fri Feb 24 11:23:10 2012 +0100
@@ -1,1 +1,1 @@
-021131fbe2c571695ce3bac8f1ff26ccae33cc72 vendor/bundles/IRI/Bundle/WikiTagBundle
+130e95ca50497e3d7c3103796179e2a01fa64140 vendor/bundles/IRI/Bundle/WikiTagBundle
--- a/app/config/config.yml Fri Feb 24 10:55:01 2012 +0100
+++ b/app/config/config.yml Fri Feb 24 11:23:10 2012 +0100
@@ -101,13 +101,13 @@
# Options for curl_setopt, typically proxy settings. If you want to use constant values, just write for example 'CURLOPT_PROXYAUTH' or 'CURLAUTH_NTLM'.
# The program will check if the string gives an existing constant
# For boolean, just write 'TRUE' or 'FALSE'.
- curl_options:
- CURLOPT_HTTPPROXYTUNNEL: 'TRUE'
- CURLOPT_PROXYAUTH: 'CURLAUTH_NTLM'
- CURLOPT_USERAGENT: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.1) Gecko/20100101 Firefox/10.0.1'
- CURLOPT_PROXY: 'derain.centrepompidou.lan:3128'
- CURLOPT_PROXYUSERPWD: 'DOM-CNAC\cavaliet:thibaut';
- CURLOPT_PROXYTYPE: 'CURLPROXY_HTTP'
+ #curl_options:
+ # CURLOPT_HTTPPROXYTUNNEL: 'TRUE'
+ # CURLOPT_PROXYAUTH: 'CURLAUTH_NTLM'
+ # CURLOPT_USERAGENT: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.1) Gecko/20100101 Firefox/10.0.1'
+ # CURLOPT_PROXY: 'derain.centrepompidou.lan:3128'
+ # CURLOPT_PROXYUSERPWD: 'DOM-CNAC\cavaliet:thibaut';
+ # CURLOPT_PROXYTYPE: 'CURLPROXY_HTTP'
services: