Artur Paikin a4668d4f96 Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/core/Core.js # src/plugins/Dashboard/index.js		2017-09-15 23:56:18 -04:00
..
core	Merge remote-tracking branch 'origin/master'	2017-09-15 23:56:18 -04:00
generic-provider-views	show detailed error message for Uppy Server connection error	2017-08-29 22:45:45 +03:00
locales	Merge pull request #278 from danmichaelo/trans-nb	2017-08-13 16:28:56 +03:00
plugins	Merge remote-tracking branch 'origin/master'	2017-09-15 23:56:18 -04:00
scss	fix FileItem source icon position and copy	2017-09-10 14:24:20 -04:00
uppy-base	providers: consistently use sticky hostname	2017-08-17 12:13:20 +02:00
vendor/file-type	add license and package.json	2017-06-14 17:14:10 -04:00
index.js	Include RestoreFiles in unpkg bundle.	2017-08-30 13:58:41 +02:00