Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
davidfekke committed Oct 30, 2018
2 parents 958e4f1 + c839317 commit bf3cd4a
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 4,163 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
language: node_js
node_js:
- "10.13.0"
- "11.0.0"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This is the source code for the JaxNode website.

[![Build Status](https://travis-ci.org/davidfekke/jaxnode.svg?branch=release)](https://travis-ci.org/davidfekke/jaxnode)
[![Coverage Status](https://coveralls.io/repos/github/davidfekke/jaxnode/badge.svg?branch=master)](https://coveralls.io/github/davidfekke/jaxnode?branch=master)
[![Node v8](http://img.shields.io/badge/node-v8.12.0-brightgreen.svg)](https://nodejs.org)
[![Node v8](http://img.shields.io/badge/node-v10.13.0-brightgreen.svg)](https://nodejs.org)
[![Node v9](http://img.shields.io/badge/node-v11.0.0-brightgreen.svg)](https://nodejs.org)

The website can be viewed at [https://www.jaxnode.com](https://www.jaxnode.com).
Expand Down
58 changes: 0 additions & 58 deletions old_Dockerfile

This file was deleted.

Loading

0 comments on commit bf3cd4a

Please sign in to comment.