Merge branch 'master' into 'notifications'
# Conflicts: # app/build.gradle # app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt
This commit is contained in:
commit
a4c3891ca5
|
@ -192,7 +192,7 @@ dependencies {
|
|||
implementation "com.mikepenz:iconics-core:5.3.0"
|
||||
implementation 'com.mikepenz:materialdrawer-iconics:8.4.2'
|
||||
implementation "com.mikepenz:iconics-views:5.3.0"
|
||||
implementation 'com.mikepenz:google-material-typeface:3.0.1.4.original-kotlin@aar'
|
||||
implementation 'com.mikepenz:google-material-typeface:4.0.0.1-kotlin@aar'
|
||||
|
||||
|
||||
implementation 'com.karumi:dexter:6.2.3'
|
||||
|
|
Loading…
Reference in New Issue