From df28013b188325bf39b9daeaab5d1682140ac0c6 Mon Sep 17 00:00:00 2001
From: Brad Fritz <brad@fewerhassles.com>
Date: Sun, 31 May 2015 11:49:33 -0400
Subject: [PATCH 1/2] Fix typo in release.md

---
 doc/release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release.md b/doc/release.md
index a4f3e50e8..cf0a48dd4 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -38,7 +38,7 @@ $ cd release
 $ ./make-release-war.sh
 ```
 
-### Deploy assemnbly jar file
+### Deploy assembly jar file
 
 For plug-in development, we have to publish the assembly jar file to the public Maven repository by `release/deploy-assembly-jar.sh`.
 

From 2e58f82a612babf8e56677b50cad58bdb35f4d87 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Mon, 1 Jun 2015 04:04:45 +0900
Subject: [PATCH 2/2] fix .travis.yml

```
java.lang.RuntimeException: Setting value cannot be null: {file:/home/travis/build/takezoe/gitbucket/}gitbucket/*:version
	at scala.sys.package$.error(package.scala:27)
	at sbt.EvaluateSettings$INode.setValue(INode.scala:143)
	at sbt.EvaluateSettings$MixedNode.evaluate0(INode.scala:175)
```
---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c9cbea3d..0498f25d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: scala
-scala:
-  - 2.11.6
+sudo: false
+script:
+  - . env.sh
+  - sbt test