Merge pr #165

cozy-labs · Dec 14, 2015 · 8369295 · 8369295
2 parents 8682ce3 + afb4f5b
commit 8369295
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,12 +1,13 @@
 .travis.yml
+app.html
 coffeelint.json
+gulpfile.js
 *.coffee
 *.styl
 bin/ci
 build/
 cache/
-client/app/
-client/vendor/
+client/
 packaging/
 tests/
 tmp/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.6.0 - 2015-12-14
+
+* Add a full-sync mode
+* Detect and manage conflicts
+* Fix some bugs
+
 ## 0.5.0 - 2015-11-30
 
 - Add a write-only mode

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cozy-desktop",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "File Synchronization Client for Cozy Cloud",
   "main": "app.html",
   "window": {