From 61aec295f0bf913273984edf7046f45eccf2ff72 Mon Sep 17 00:00:00 2001
From: Luciano Mammino <lmammino@oryzone.com>
Date: Fri, 9 Jan 2015 20:15:08 +0000
Subject: [PATCH] updated jQuery to the latest h5bp version. Closes #24

---
 Resources/views/html5.html.twig | 2 +-
 composer.json                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/views/html5.html.twig b/Resources/views/html5.html.twig
index a9e59f8..dad5d55 100644
--- a/Resources/views/html5.html.twig
+++ b/Resources/views/html5.html.twig
@@ -55,7 +55,7 @@
             </div>
         {%endblock body_container%}
         {% block body_js %}
-            {% block body_js_jquery %}<script src="{% block body_js_jquery_onlineSrc %}//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js{% endblock %}"></script>
+            {% block body_js_jquery %}<script src="{% block body_js_jquery_onlineSrc %}//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js{% endblock %}"></script>
                 <script>window.jQuery || document.write('<script src="{% block body_js_jquery_offlineSrc %}{% javascripts 'components/jquery/jquery.min.js' %}{{ asset_url }}{% endjavascripts %}{% endblock %}"><\/script>')</script>
             {% endblock body_js_jquery %}
             {% block body_js_analytics %}
diff --git a/composer.json b/composer.json
index 001a82f..9c7d485 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "php": ">=5.3.2",
         "symfony/framework-bundle": ">=2.0,<3.0-dev",
         "components/html5-boilerplate": "4.3.*",
-        "components/jquery": ">=1.10.2,<1.11-dev"
+        "components/jquery": ">=1.10.2,<=1.11.2"
     },
     "autoload": {
         "psr-0": { "Oryzone\\Bundle\\BoilerplateBundle": "" }