core: bump to 2.1.5, add changelog for 2.1.4

5 years ago · 0f742bc3a7
parent 9814f886ce
commit 0f742bc3a7
2 changed files with 4 additions and 1 deletions
--- a/core/ChangeLog
+++ b/core/ChangeLog
@ -1,6 +1,9 @@
 Version 2.x.x [not yet released]
 * nothing yet

+Version 2.1.4 [Aug 2019 hotfix]
+* Shamir Backup reset device hotfix
+
 Version 2.1.3 [Aug 2019]
 * Shamir Backup with Recovery persistence
 * Touchscreen freeze fix
--- a/core/embed/firmware/version.h
+++ b/core/embed/firmware/version.h
@ -1,6 +1,6 @@
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 1
-#define VERSION_PATCH 4
+#define VERSION_PATCH 5
 #define VERSION_BUILD 0

 #define FIX_VERSION_MAJOR 2