Merge branch 'master' into 'master'

Updated AMAM to 1.4.0

Updated app to 1.4.0. Building was tested locally
I have removed build/ from the whole repository, might enable UCM in a future update


See merge request !1400
This commit is contained in:
Boris Kraut 2016-05-07 10:41:28 +00:00
commit 8e0b0bdfba

View file

@ -40,14 +40,13 @@ Build:1.3.4,10304
Build:1.3.5,10305 Build:1.3.5,10305
commit=v1.3.5 commit=v1.3.5
subdir=platforms/android subdir=platforms/android/
Maintainer Notes: Build:1.4.0,10400
Can't use UCM until upstream removes build/, since the generated commit=v1.4.0
AndroidManifest.xml in intermediates/ is tripping up fdroidserver. subdir=platforms/android/
.
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:None Update Check Mode:None
Current Version:1.3.5 Current Version:1.4.0
Current Version Code:10305 Current Version Code:10400