Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

1 files changed, 12 insertions, 0 deletions

diff --git a/vendor/golang.org/x/text/encoding/japanese/all.go b/vendor/golang.org/x/text/encoding/japanese/all.go
new file mode 100644
index 000000000..6cfa8de45
--- /dev/null
+++ b/vendor/golang.org/x/text/encoding/japanese/all.go
@@ -0,0 +1,12 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package japanese
+
+import (
+	"golang.org/x/text/encoding"
+)
+
+// All is a list of all defined encodings in this package.
+var All = []encoding.Encoding{EUCJP, ISO2022JP, ShiftJIS}