Merge remote-tracking branch 'origin/master' into dev

Conflicts: bower.json
Talv · Nov 10, 2015 · 025b708 · 025b708
2 parents f2ec6e3 + 80c93e2
commit 025b708
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "x-editable",
-  "version": "1.5.2",
   "main": [
     "./dist/bootstrap3-editable/css/bootstrap-editable.css",
     "./dist/bootstrap3-editable/js/bootstrap-editable.min.js",
@@ -9,7 +8,7 @@
     "./dist/bootstrap-editable/js/bootstrap-editable.min.js",
 
     "./dist/jqueryui-editable/css/jqueryui-editable.css",
-    ".dist/jqueryui-editable/js/jqueryui-editable.min.js",
+    "./dist/jqueryui-editable/js/jqueryui-editable.min.js",
 
     "./dist/jquery-editable/css/jquery-editable.css",
     "./dist/jquery-editable/js/jquery-editable-poshytip.min.js"