Merge branch 'master' into dragdrop

Conflicts:
	package.json
	src/core/Transloadit.js
This commit is contained in:
Artur Paikin 2015-11-27 14:08:00 +03:00
commit 6c2aa68fb0
25 changed files with 673 additions and 81 deletions

9
src/plugins/index.js Normal file
View file

@ -0,0 +1,9 @@
import DragDrop from './DragDrop'
import TransloaditBasic from './TransloaditBasic'
import Tus10 from './Tus10'
export default {
DragDrop,
TransloaditBasic,
Tus10
}