NZOI / nztrain / 521

38%

push

travis-ci

Merge branch 'deployed'

The branches 'master' and 'deployed' have diverged:

 - 'master' contains pull request #23 ("Fixes") with three commits

 - 'deployed' contains a large commit with mostly the same changes
   (0b560f9 "Changes that Andrew made on the server") and @puqeko's
   recent work (#24, #26, #29, #30)

Changes that are only in 'master':

 - update Ruby in .travis.yaml from 2.0.0 to 2.2.9 (c8e987f, part of #23)

Changes that are only in 'deployed':

 - update Ubuntu release of chroot from "precise" to "xenial" (part of 0b560f9)
 - update package name of GHC from "ghc6" to "ghc" (part of 0b560f9)
 - @puqeko's recent work

This commit merges them together.

11 of 11 new or added lines in 2 files covered. (100.0%)

170 of 9364 relevant lines covered (1.82%)

0.02 hits per line