Merge branch 'master' of github.com:tus/tusd into composer

Conflicts: cmd/tusd/main.go
2016-02-22 12:21:23 +01:00 · 2016-02-22 12:21:23 +01:00 · 4675d90a4e
parent 1cee5eb0f3 67d7757e9f
commit 4675d90a4e
1 changed files with 1 additions and 1 deletions
--- a/cmd/tusd/main.go
+++ b/cmd/tusd/main.go
@ -95,7 +95,7 @@ func main() {

 	handler, err := tusd.NewHandler(tusd.Config{
 		MaxSize:               maxSize,
-		BasePath:              "files/",
+		BasePath:              basepath,
 		StoreComposer:         composer,
 		NotifyCompleteUploads: true,
 	})