Merge branch 'master' into 'master'

Fix !1158

fdroid checkupdates and fdroid build are OK, now.

EDIT : previous fork as been removed, due to a bug with git on my repo. The problem on the previous merge request was that the package ID and version number didn't match with the manifest tagged on my git repo. A second problem was a poorly managed versionCode by the Cordova framework. Both problems are solved.

See merge request !1173
This commit is contained in:
Daniel Martí 2016-01-26 19:52:43 +00:00
commit 0a689c0b1f

View file

@ -14,18 +14,11 @@ android devices to the IoT network.
Repo Type:git Repo Type:git
Repo:https://git.framasoft.org/tpape/Diolite-android.git Repo:https://git.framasoft.org/tpape/Diolite-android.git
Build:1.1.2,112 Build:1.1.2,10102
disable=wait for upstream
commit=v1.1.2 commit=v1.1.2
gradle=yes gradle=yes
Maintainer Notes:
Auto Update Mode:Version v%v Auto Update Mode:Version v%v
...once version is set up correct.
.
Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:0.0.1 Current Version:1.1.2
Current Version Code:1 Current Version Code:10102