set conf 2, merge upstream update

This commit is contained in:
DenioD
2019-10-31 17:23:44 +01:00
16 changed files with 521 additions and 56 deletions

View File

@@ -1 +1 @@
#define APP_VERSION "1.0-beta1"
#define APP_VERSION "1.0"