Merge branch 'master' into 'master'

add Nextcloud client version 1.2.0 RC2

Sorry for the very fast RC2, but we found an urgent fix.

See merge request !1559
This commit is contained in:
Boris Kraut 2016-07-25 15:29:40 +00:00
commit 1a89ad5db3

View file

@ -34,8 +34,8 @@ Build:1.1.0,10010099
gradle=yes gradle=yes
rm=libs/disklrucache*,user_manual rm=libs/disklrucache*,user_manual
Build:1.2.0 RC1,10020001 Build:1.2.0 RC2,10020002
commit=rc-1.2.0-01 commit=rc-1.2.0-02
submodules=yes submodules=yes
gradle=yes gradle=yes
rm=libs/disklrucache*,user_manual rm=libs/disklrucache*,user_manual