Merge remote-tracking branch 'upstream/master'

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Transloadit
+Copyright (c) 2018 Transloadit
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -98,7 +98,7 @@ Alternatively, you can also use a pre-built bundle, for example from [unpkg CDN]
 - [Uppy](https://uppy.io/docs/uppy/) — full list of options, methods and events.
 - [Plugins](https://uppy.io/docs/plugins/) — list of Uppy plugins and their options.
 - [Server](https://uppy.io/docs/server/) — setting up and running an Uppy Server instance, which adds support for Instagram, Dropbox, Google Drive and other remote sources.
-- [React](/docs/react/) — components to integrate Uppy UI plugins with React apps.
+- [React](https://uppy.io/docs/react/) — components to integrate Uppy UI plugins with React apps.
 - Architecture & Making a Plugin — how to write a plugin for Uppy [documentation in progress].
 
 ## Plugins

examples/cdn-example/index.html

@@ -13,7 +13,6 @@
       const Dashboard = Uppy.Dashboard
       const Webcam = Uppy.Webcam
       const Tus = Uppy.Tus
-      const Informer = Uppy.Informer
 
       const uppy = Uppy.Core({debug: true, autoProceed: false})
       .use(Uppy.Dashboard, {
@@ -22,7 +21,6 @@
       })
       .use(Webcam, {target: Dashboard})
       .use(Tus, {endpoint: 'https://master.tus.io/files/', resume: true})
-      .use(Informer, {target: Dashboard})
 
       uppy.run()