Merge branch 'master' into work

7 years ago · aa920aee27
parent 73c98eb2d1 7b8c936559
commit aa920aee27
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 01148465b71b640892a50ec825205ae581d6dca7
+Subproject commit 4a032ee3b52920bf59ae21b4effc31fdf3cece33
--- a/user/version.h
+++ b/user/version.h
@ -11,8 +11,7 @@
 #define FW_V_MAJOR 2
 #define FW_V_MINOR 1
 #define FW_V_PATCH 0
-#define FW_V_SUFFIX "-beta3"
-//#define FW_V_SUFFIX ""
+#define FW_V_SUFFIX ""
 #define FW_CODENAME "Anthill" // 2.1.0
 #define FW_CODENAME_QUOTED "\""FW_CODENAME"\""