diff options
| author | Allan Wang <me@allanwang.ca> | 2019-04-21 20:26:01 -0400 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-04-21 20:26:01 -0400 |
| commit | 4739e6f58df1116babac69896764e83db551f583 (patch) | |
| tree | 5ec13511c0832a5fabe3f6ca812284229c847c24 | |
| parent | bbafb7b65ce655c1fdda8badd3098d2a0e1f7f08 (diff) | |
| download | frost-4739e6f58df1116babac69896764e83db551f583.tar.gz frost-4739e6f58df1116babac69896764e83db551f583.tar.bz2 frost-4739e6f58df1116babac69896764e83db551f583.zip | |
Merge properties
| -rw-r--r-- | docs/Changelog.md | 6 | ||||
| -rw-r--r-- | gradle.properties | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/docs/Changelog.md b/docs/Changelog.md index 3d72ec4f..7a6bbfab 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -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 diff --git a/gradle.properties b/gradle.properties index c080daa0..4c0ace29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 |