Merge branch 'master' into dev

This commit is contained in:
2021-05-23 17:47:14 -05:00
66 changed files with 699 additions and 553 deletions

View File

@@ -30,7 +30,7 @@ jobs:
AndroidTest:
needs: Build
runs-on: macOS-10.15
timeout-minutes: 45
timeout-minutes: 60
strategy:
matrix:
api: [