From b0ab23dad4ee40e5138f17ea31f5c311527a7d63 Mon Sep 17 00:00:00 2001
From: Juan Cruz Viotti <jviottidc@gmail.com>
Date: Fri, 11 Dec 2015 21:30:02 -0400
Subject: [PATCH] v2.5.0

---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97622da0..9af50128 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.5.0] - 2015-12-11
+
+### Added
+
+- Show device id in `resin devices`.
+- Add helpful instructions after `resin quickstart`.
+- Add timestamp to `resin logs` lines.
+
+### Changed
+
+- Lazy load command actions dependencies for performance reasons.
+
 ## [2.4.0] - 2015-12-01
 
 ### Added
@@ -109,6 +121,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Remove outdated information from README.
 
+[2.5.0]: https://github.com/resin-io/resin-cli/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/resin-io/resin-cli/compare/v2.3.0...v2.4.0
 [2.3.0]: https://github.com/resin-io/resin-cli/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/resin-io/resin-cli/compare/v2.1.0...v2.2.0
diff --git a/package.json b/package.json
index 241aed5b..3acad1b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "resin-cli",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Git Push to your devices",
   "main": "./build/actions/index.js",
   "homepage": "https://github.com/resin-io/resin-cli",