Merge branch 'master' of https://github.com/transloadit/uppy

src/views/ProviderView/index.js

@@ -186,7 +186,6 @@ module.exports = class ProviderView {
    */
   logout () {
     this.Provider.logout(location.href)
-      .then((res) => res.json())
       .then((res) => {
         if (res.ok) {
           const newState = {

website/src/docs/server.md

@@ -265,6 +265,10 @@ app.use(uppy.app({
 
 The default value simply returns `filename`, so all files will be uploaded to the root of the bucket as their original file name.
 
+### Run in Kubernetes
+
+We have [a detailed guide on running Uppy Server in Kubernetes](https://github.com/transloadit/uppy-server/blob/master/KUBERNETES.md) for you, that’s how we currently run our example server at http://server.uppy.io.
+
 ### Adding Custom Providers
 
 As of now, Uppy Server supports **Google Drive**, **Dropbox**, **Instagram**, and **Url** (remote urls) out of the box, but you may also choose to add your custom providers. You can do this by passing the `customProviders` option when calling the uppy `app` method. The custom provider is expected to support Oauth 1 or 2 for authentication/authorization.
@@ -329,7 +333,6 @@ npm run start:dev
 
 This would get the Uppy Server running on `http://localhost:3020`.
 
-## Running example
+## Live example
 
 An example server is running at http://server.uppy.io, which is deployed with [Kubernetes](https://github.com/transloadit/uppy-server/blob/master/KUBERNETES.md)
-