From afb4f5b6978996e8ecd953a89b5564b928dcb5a8 Mon Sep 17 00:00:00 2001 From: Bruno Michel Date: Fri, 11 Dec 2015 16:52:36 +0100 Subject: [PATCH] Prepare the v0.6.0 release --- .npmignore | 5 +++-- CHANGELOG.md | 6 ++++++ package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.npmignore b/.npmignore index 0fddf15f0..03d6d175a 100644 --- 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 index 624d5454e..ebf5a6922 100644 --- 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 index 46e8d05fa..d6ded2ffa 100644 --- 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": {