Merge branch 'koreader:master' into master

4 weeks ago · c6ddced5f5
parent 01605175f0 ad6e3b34c4
commit c6ddced5f5
3 changed files with 4 additions and 4 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -16,7 +16,7 @@ workflows:
 jobs:
  build:
    docker:
-      - image: koreader/kobase:0.3.1-20.04
+      - image: koreader/kobase:0.3.2-20.04
        auth:
          username: $DOCKER_USERNAME
          password: $DOCKER_PASSWORD
@ -69,7 +69,7 @@ jobs:
          path: koreader-emulator-x86_64-linux-gnu/koreader/junit-test-results.xml
  docs:
    docker:
-      - image: koreader/kobase:0.3.1-20.04
+      - image: koreader/kobase:0.3.2-20.04
        auth:
          username: $DOCKER_USERNAME
          password: $DOCKER_PASSWORD
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 781db253176d6a7bed650dfa4057ff361b0674bb
+Subproject commit c440af0a57ca5127d12f366fff3fc59ad885d809
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@ -1 +1 @@
-Subproject commit 6714035be92d660bb5b7915b284fa7f108c257d5
+Subproject commit c1c82a5db3d0989adf92140092108c55c110e1c6