Merge remote-tracking branch 'origin/dev'

# Conflicts: # android/AndroidManifest.xml
HelloVolla · Dec 18, 2023 · d2601b3 · d2601b3
2 parents 1d85f24 + 07ee5bd
commit d2601b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/AppGrid.qml b/AppGrid.qml
@@ -127,7 +127,7 @@ LauncherPage {
         }
     }
 
-    function updateA                               ppLauncher(key, value) {
+    function updateAppLauncher(key, value) {
         console.log("AppGrid | Will update app launcher: " + key + ", " + value)
         if (key === "backgroundOpacity") {
             for (var i = 0; i < appLauncher.appGroups.length; i++) {

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.3.1" android:versionCode="292" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.3.2" android:versionCode="293" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.