Merge branch 'master' into add-enable-on-update

mattermost-community · Jan 20, 2020 · dffa8c1 · dffa8c1
2 parents 0c963af + 701830d
commit dffa8c1
Show file tree

Hide file tree

Showing 337 changed files with 151 additions and 56,894 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/build/manifest/main.go b/build/manifest/main.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/v5/model"
 	"github.com/pkg/errors"
 )
 

diff --git a/build/manifest/vendor/github.com/google/uuid/.travis.yml b/build/manifest/vendor/github.com/google/uuid/.travis.yml
diff --git a/build/manifest/vendor/github.com/google/uuid/CONTRIBUTING.md b/build/manifest/vendor/github.com/google/uuid/CONTRIBUTING.md
diff --git a/build/manifest/vendor/github.com/google/uuid/CONTRIBUTORS b/build/manifest/vendor/github.com/google/uuid/CONTRIBUTORS
diff --git a/build/manifest/vendor/github.com/google/uuid/LICENSE b/build/manifest/vendor/github.com/google/uuid/LICENSE
diff --git a/build/manifest/vendor/github.com/google/uuid/README.md b/build/manifest/vendor/github.com/google/uuid/README.md
diff --git a/build/manifest/vendor/github.com/google/uuid/dce.go b/build/manifest/vendor/github.com/google/uuid/dce.go
diff --git a/build/manifest/vendor/github.com/google/uuid/doc.go b/build/manifest/vendor/github.com/google/uuid/doc.go
diff --git a/build/manifest/vendor/github.com/google/uuid/hash.go b/build/manifest/vendor/github.com/google/uuid/hash.go
diff --git a/build/manifest/vendor/github.com/google/uuid/marshal.go b/build/manifest/vendor/github.com/google/uuid/marshal.go
diff --git a/build/manifest/vendor/github.com/google/uuid/node.go b/build/manifest/vendor/github.com/google/uuid/node.go
diff --git a/build/manifest/vendor/github.com/google/uuid/node_js.go b/build/manifest/vendor/github.com/google/uuid/node_js.go