Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
fynntimes committed Dec 31, 2017
2 parents 7d73816 + 4abfeb4 commit 03bb115
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: java
jdk:
- oraclejdk8
before_install:
- chmod +x gradlew
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
![Prison](https://faizaand.me/img/prison-banner.png)
![Prison Banner](https://faizaand.me/prison/img/prison-banner.png)

[![Join the chat at https://gitter.im/SirFaizdat/Prison](https://badges.gitter.im/SirFaizdat/Prison.svg)](https://gitter.im/SirFaizdat/Prison)
[![Join the chat at https://gitter.im/SirFaizdat/Prison](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/396ed5F)
[![License](https://img.shields.io/badge/license-GPL%20License%20v3-blue.svg)](LICENSE.md)
[![Build Status](https://travis-ci.org/MC-Prison/Prison.svg)](https://travis-ci.org/MC-Prison/Prison)

1. [What is Prison?](#what-is-prison)
2. [Why should I use Prison?](#why-should-i-use-prison)
Expand Down

0 comments on commit 03bb115

Please sign in to comment.