merged develop

This commit is contained in:
Tom Gardham-Pallister 2017-02-06 22:06:18 +00:00
commit 86a197e22d
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
# Ocelot
[![Build status](https://ci.appveyor.com/api/projects/status/roahbe4nl526ysya?svg=true)](https://ci.appveyor.com/project/TomPallister/ocelot)
[![Build status](https://ci.appveyor.com/api/projects/status/r6sv51qx36sis1je?svg=true)](https://ci.appveyor.com/project/TomPallister/ocelot-fcfpb)
[![Join the chat at https://gitter.im/Ocelotey/Lobby](https://badges.gitter.im/Ocelotey/Lobby.svg)](https://gitter.im/Ocelotey/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@ -47,7 +47,7 @@ Install Ocelot and it's dependecies using nuget. At the moment
all we have is the pre version. Once we have something working in
a half decent way we will drop a version.
`Install-Package Ocelot -Pre`
`Install-Package Ocelot`
All versions can be found [here](https://www.nuget.org/packages/Ocelot/)

View File

@ -1 +1 @@
./build.ps1 -target build-full
./build.ps1 -target BuildAndReleaseUnstable