1
0
mirror of https://github.com/AllanWang/Frost-for-Facebook.git synced 2024-11-08 12:02:33 +01:00

Merge properties

This commit is contained in:
Allan Wang 2019-04-21 20:26:01 -04:00
parent bbafb7b65c
commit 4739e6f58d
No known key found for this signature in database
GPG Key ID: C93E3F9C679D7A56
2 changed files with 0 additions and 14 deletions

View File

@ -1,10 +1,5 @@
# Changelog
<<<<<<< HEAD
## v2.2.3
* Add ability to hide stories
* Remove fbclid from urls
=======
## v2.2.4
* Show top bar to allow sharing posts
* Fix unmuting videos when autoplay is enabled
@ -18,7 +13,6 @@
* Remove round icon settings as they are the default in Facebook
* Update theme
* Update translations
>>>>>>> dev
## v2.2.2
* New marketplace shortcut

View File

@ -14,11 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
APP_ID=Frost
APP_GROUP=com.pitchedapps
<<<<<<< HEAD
KAU=4.0.0-alpha02
=======
KAU=4.0.0
>>>>>>> dev
KOTLIN=1.3.21
# https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
@ -60,13 +56,9 @@ MATERIAL_DRAWER_KT=2.0.1
# https://github.com/square/okhttp/releases
OKHTTP=3.14.0
# http://robolectric.org/getting-started/
<<<<<<< HEAD
ROBOELECTRIC=4.1
# https://developer.android.com/jetpack/androidx/releases/room
ROOM=2.1.0-alpha04
=======
ROBOELECTRIC=4.2
>>>>>>> dev
# https://github.com/davemorrissey/subsampling-scale-image-view#quick-start
SCALE_IMAGE_VIEW=3.10.0
# https://github.com/umano/AndroidSlidingUpPanel#importing-the-library