Merge branch 'develop'

mturlo · Feb 1, 2017 · f86df0c · f86df0c
1 parent 760ecf4
commit f86df0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # Lunchbot
-[![Build Status](https://api.travis-ci.org/mturlo/lunchbot.svg?branch=develop)](https://travis-ci.org/mturlo/lunchbot)
+[![Build Status](https://api.travis-ci.org/mturlo/lunchbot.svg)](https://travis-ci.org/mturlo/lunchbot)
 
 Lunchbot is a Slack bot to help organise lunch ordering in teams. When ordering in a group, it is often troublesome to keep track of who wants to participate, what food do they want and if they paid the ordering person (the Lunchmaster). This bot's goal is to help make that process more efficient and organised.
 
-![alt tag](https://raw.githubusercontent.com/mturlo/lunchbot/develop/sample.png)
+![alt tag](https://raw.githubusercontent.com/mturlo/lunchbot/master/sample.png)
 
 _([pmxbot](https://github.com/yougov/pmxbot) makes a brief appearance here)_
 

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 name := "lunchbot"
 
-version := "1.0.0-SNAPSHOT"
+version := "1.0.0"
 
 scalaVersion := "2.11.8"