Merge branch 'master' into save-backupSTR

Pick up changed VERSION file
This commit is contained in:
Phil Olynyk 2020-05-19 15:01:14 -04:00
commit 26eb76b5ff

View File

@ -1,5 +1,5 @@
// Update the string below to set OSCAR's version and release status.
// See https://semver.org/spec/v2.0.0.html for details on format.
#define VERSION "1.1.1-rc-1"
#define VERSION "1.1.1-rc-2"