Merge branch 'patch-10' into 'master'

Telegram 4.6c Security Update

See merge request fdroid/fdroiddata!3332
This commit is contained in:
Marcus 2018-06-19 15:18:01 +00:00
commit 8b0c5c2b70

View file

@ -349,6 +349,19 @@ Build:4.6.0b,11575
popd
ndk=r14b
Build:4.6.0с,11585
commit=v4.6с
subdir=TMessagesProj
submodules=yes
gradle=fat
rm=TMessagesProj/jni/libwebp/swig/libwebp.jar,TMessagesProj/jni/ffmpeg/tests/ref/fate/sub-microdvd-remux
prebuild=echo -e 'APP_ID = 12834\nAPP_HASH = c84d9229db1d6be95c067b02b126352c' > API_KEYS
build=export NDK=$$NDK$$ && \
pushd jni && \
./build_ffmpeg_android.sh && \
popd
ndk=r14b
Maintainer Notes:
Summary and Description have been moved to the new localizable text files:
https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
@ -359,5 +372,5 @@ Bump again for faster build.
Auto Update Mode:None
Update Check Mode:None
Current Version:4.6.0b
Current Version Code:11575
Current Version:4.6.0с
Current Version Code:11585