Merge branch 'master' into 'master'

Reenabled build. Forgot to push the tag to the github branch.



See merge request !1588
This commit is contained in:
Daniel Martí 2016-08-05 17:28:21 +00:00
commit 105172a130

View file

@ -88,7 +88,6 @@ Build:1.0.16.2,43
scanignore=app/src/main/resources/org/joda/time/tz/data
Build:1.1.0.1,45
disable=mistagged? git can't figure out the tag
commit=v1.1.0.1
subdir=app
submodules=yes