Update README.md

This commit is contained in:
Sébastien Clément 2018-02-28 20:56:48 +01:00 committed by GitHub
parent c5bfbc387f
commit 23a93b81ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
# BrokenDiscordBot
Master:<br/> [![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/master)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/master/)
Master:<br/>[![Build Status](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/badge/icon)](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/devel)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/devel/)
@ -70,6 +70,10 @@ Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=Br
> ```
> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
### [Javadoc](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/javadoc/)
### [Jenkins](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
#### Jenkisfile
`git config --global merge.ours.driver true`