Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
hpsaturn committed Jan 29, 2025
2 parents 7ad2c15 + 8e7a2ee commit 2fa27df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
<string name="content_description_welcome" translatable="false">CanAirIO</string>
<string name="about_licence_l2" translatable="false">(rfc 3261) GNU GPL License V3</string>
<string name="about_title_colaboration">Contributors:</string>
<string name="about_content_contributors" translatable="false">\Hackbo.org @offraylc Mutabit.com @roberbike @Nelpin @arhuaco @brolin @cedancp @Marvin-YYC @eljuguetero @epatarroyo @fjospinas @gaguevaras @hpsaturn @ikks @juandavideth @juanpa097 @melkati @roberbike @sebastian-code @trecetp</string>
<string name="about_content_contributors" translatable="false">\Hackbo.org @offraylc Mutabit.com @jcomas @roberbike @Nelpin @arhuaco @brolin @cedancp @Marvin-YYC @eljuguetero @epatarroyo @fjospinas @gaguevaras @hpsaturn @ikks @juandavideth @juanpa097 @melkati @roberbike @sebastian-code @trecetp</string>
<string name="about_title_donors">Donors:</string>
<string name="about_content_donors" translatable="false">\@arhuaco @baerchiathomei @cedancp @davegriffiths @hpsaturn @ikks @josedavid @Karisma @kleper @roberbike</string>
<string name="summary_key_device_status_connected">Connected</string>
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ org.gradle.jvmargs=-Xmx3096m -Dfile.encoding=UTF-8 \

mCompileSdkVersion=33
mMinSdkVersion=23
mTargetSdkVersion=33
mVersionCode=620
mVersionName=0.9.0
mTargetSdkVersion=34
mVersionCode=621
mVersionName=0.9.1
android.useAndroidX=true
android.enableJetifier=true

Expand Down

0 comments on commit 2fa27df

Please sign in to comment.