chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Thu, 26 Apr 2018 14:36:07 +0000 (14:36 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Thu, 26 Apr 2018 14:36:07 +0000 (14:36 +0000)
commit03ad2578d4a826a9ef767f9d1ff4a32fe901e090
tree5b0d8fb3b41f27829cc3462765e6c0cf64b23648
parent74c6555c719e685d225baa00670ee12779bdeff1
parent0e5ed1bb115eec92049ebe253eb99ff4d7e79f36
Merge branch 'master' into 'master'

fix bad parsing of maxSdkVersion as a @string resource

See merge request fdroid/fdroidserver!494