chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Wed, 28 Feb 2018 21:42:06 +0000 (21:42 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Wed, 28 Feb 2018 21:42:06 +0000 (21:42 +0000)
commit4197a4a64a074124375d879d1fab27c2dc51f4f2
treed089aaffda383b543efd00db369c29263cbda53c
parent01a73071c7e9f4c55186ee3cd4ed63d5266d1eb6
parent498ea5d6095784841538e61892a8cfbfe6eecc48
Merge branch 'master' into 'master'

update: make icon extraction less dependent on aapt

Closes fdroid-website#192

See merge request fdroid/fdroidserver!469