Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/unified_push_nextcloud_notificat…
Browse files Browse the repository at this point in the history
…ions' into unified_push_nextcloud_notifications

# Conflicts:
#	app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt
#	app/src/main/res/values/strings.xml
  • Loading branch information
gavine99 committed Feb 6, 2025
2 parents c6bb690 + d4de9d3 commit f8eb01c
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@ dependencies {
// unified push library for generic flavour
genericImplementation 'org.codeberg.UnifiedPush:android-connector:2.4.0'

// unified push library for generic flavour
genericImplementation 'org.codeberg.UnifiedPush:android-connector:2.4.0'

gplayImplementation 'com.google.android.gms:play-services-base:18.5.0'
gplayImplementation "com.google.firebase:firebase-messaging:24.1.0"

Expand Down

0 comments on commit f8eb01c

Please sign in to comment.