Merge branch 'master' of github.com:agea/CmisJS

agea · agea · commit 13160a9c69da · 2014-03-10T09:27:13.000+01:00
Conflicts:
	lib/cmis.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "cmis",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "dependencies": {
   	"superagent":""
   	},
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "CmisJS",
   "name": "cmis",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "homepage": "http://github.com/agea/CmisJS",
   "description": "a CMIS client library written in Javascript for node and the browser",
   "author": {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"title": "CmisJS",`
`3`	`3`	`"name": "cmis",`
`4`		`- "version": "0.1.4",`
	`4`	`+ "version": "0.1.5",`
`5`	`5`	`"homepage": "http://github.com/agea/CmisJS",`
`6`	`6`	`"description": "a CMIS client library written in Javascript for node and the browser",`
`7`	`7`	`"author": {`