chiark / gitweb /
~ianmdlvl / fdroidserver.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1210dc7 d522bb7)
Merge branch 'java8-and-other-fixes' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Mon, 27 Jun 2016 18:48:19 +0000 (18:48 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Mon, 27 Jun 2016 18:48:19 +0000 (18:48 +0000)
commit8691bd9cf9cd95faaca2b492a0dbc2635dd3cceb
treed8ff2b82dfc9c29052f0449e87dc0d918df58050tree | snapshot
parent1210dc776970401cce228ee45abe79d6da62d357commit | diff
parentd522bb7e172a3fce502f1bf043336cad4e7f8f52commit | diff
Merge branch 'java8-and-other-fixes' into 'master'

Java8 and other fixes

This fixes the OSX travis-ci job for the Java8 update, and also two other fixes as described in the commit message.  @CiaranG I think the _/etc/profile_ approach in 7b466b6266a466a954c845968271283ad60e43ea gets us closer to the idea of having the `fdroid build` jobs run in the same environment as `vagrant ssh`.

See merge request !138
Unnamed repository; edit this file 'description' to name the repository.