merge from dev

2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
@@ -1,6 +1,6 @@
 {
  "name": "requirejs",
-  "version": "2.1.20",
+  "version": "2.1.22",
  "ignore": [],
  "homepage": "http://requirejs.org",
  "authors": [
@@ -15,11 +15,11 @@
    "BSD-3-Clause",
    "MIT"
  ],
-  "_release": "2.1.20",
+  "_release": "2.1.22",
  "_resolution": {
    "type": "version",
-    "tag": "2.1.20",
-    "commit": "eaec2af816f2550c0a4a2b69a4f3a635aec48d29"
+    "tag": "2.1.22",
+    "commit": "9cd0b99417eac61e890d11c5119f2e45e752c999"
  },
  "_source": "git://github.com/jrburke/requirejs-bower.git",
  "_target": "~2.1.19",