chiark / gitweb /
~ianmdlvl / fdroidserver.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.