chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Thu, 15 Mar 2018 15:23:55 +0000 (15:23 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Thu, 15 Mar 2018 15:23:55 +0000 (15:23 +0000)
commit4b788b3b0959b35fc4c02aa8b9f74dba20b8ab25
tree0ee79f2b90f2134de51849c23b5657a860ca58a4
parentd290eb96f986b4067570ab3855e6abbcc47020f8
parent54242dee32218955f69297b344d81d4d2042eaf8
Merge branch 'master' into 'master'

update: handle AndroidManifest XML namespace named other than 'android'

See merge request fdroid/fdroidserver!481