Merge branch 'main' into renovate/androidx.paging

ashdavies · Dec 12, 2024 · c5e1c49 · c5e1c49
2 parents 57f35cd + b9141e3
commit c5e1c49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conferences-app/src/androidMain/AndroidManifest.xml b/conferences-app/src/androidMain/AndroidManifest.xml
@@ -11,7 +11,7 @@
             android:name="io.ashdavies.party.MainActivity"
             android:configChanges="keyboardHidden|orientation"
             android:exported="true"
-            android:label="Playground"
+            android:label="Conferences"
             android:theme="@style/Theme.Material3.DynamicColors.DayNight">
 
             <intent-filter>

diff --git a/conferences-app/src/commonMain/composeResources/values/strings.xml b/conferences-app/src/commonMain/composeResources/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="application">Playground</string>
+    <string name="application">Conferences</string>
     <string name="upcoming">Upcoming</string>
     <string name="profile">Profile</string>
     <string name="events">Events</string>