Merge branch 'master' into 'master'

Fix Conversations build



See merge request !1660
This commit is contained in:
Daniel Martí 2016-09-04 02:27:29 +00:00
commit d0b4859f5a

View file

@ -724,7 +724,7 @@ Build:1.13.9,168
Build:1.14.0,171 Build:1.14.0,171
commit=1.14.0 commit=1.14.0
gradle=free gradle=free
prebuild=sed -i -e '/playstoreCompile/d' -e '/maven {/,+2d' build.gradle prebuild=sed -i -e '/playstoreCompile/d' -e '/play-services-gcm/d' -e '/maven {/,+2d' build.gradle
Auto Update Mode:Version %v Auto Update Mode:Version %v
Update Check Mode:Tags ^[0-9.]+$ Update Check Mode:Tags ^[0-9.]+$