Merge branch 'master' of github.com:aendrew/jquery-mobile-bower into …

…aendrew-master Conflicts: bower.json
jobrapido · Mar 14, 2014 · ef1d5a9 · ef1d5a9
2 parents 02de15c + bbcace2
commit ef1d5a9
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,10 @@
 {
   "name": "jquery-mobile-bower",
   "version": "1.4.2",
+  "main": [
+    "js/jquery.mobile-1.4.2.js",
+    "css/jquery.mobile-1.4.2.css"
+  ],
   "dependencies": {
     "jquery": "~1.10.0"
   },