chiark / gitweb /
Merge branch 'port-to-osx-and-trusty' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Wed, 20 Sep 2017 15:24:57 +0000 (15:24 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Wed, 20 Sep 2017 15:24:57 +0000 (15:24 +0000)
commitca069d941dfa956672410bc8561c5051028e2b7e
tree9568fb66c352a8868b8486efdd5bec0300e5bf64
parentc225e0c363a569a6391a5d625311bc6e02b68da9
parent86a3ef5355c828e2dc56b586fc6f5d690ca5afda
Merge branch 'port-to-osx-and-trusty' into 'master'

port to OSX and Ubuntu/trusty

See merge request fdroid/fdroidserver!341