Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Matthieu 2021-09-09 13:38:24 +00:00
parent db5d397de3 002b1548e1
commit a4c3891ca5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -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'