bindata: update changes from pull requests

gogs.go

@@ -16,7 +16,7 @@ import (
 	"github.com/gogits/gogs/pkg/setting"
 )
 
-const APP_VER = "0.11.35.0306"
+const APP_VER = "0.11.36.0306"
 
 func init() {
 	setting.AppVer = APP_VER

pkg/bindata/bindata.go

@@ -107,6 +107,7 @@
 // conf/gitignore/Packer
 // conf/gitignore/Perl
 // conf/gitignore/Phalcon
+// conf/gitignore/PhpStorm
 // conf/gitignore/PlayFramework
 // conf/gitignore/Plone
 // conf/gitignore/Prestashop
@@ -156,6 +157,7 @@
 // conf/gitignore/VisualStudioCode
 // conf/gitignore/Waf
 // conf/gitignore/WebMethods
+// conf/gitignore/WebStorm
 // conf/gitignore/Windows
 // conf/gitignore/WordPress
 // conf/gitignore/Xcode
@@ -2437,6 +2439,26 @@ func confGitignorePhalcon() (*asset, error) {
 	return a, nil
 }
 
+var _confGitignorePhpstorm = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x53\x4d\x6f\xdb\x3a\x10\xbc\xeb\x57\x10\xd0\xe5\x3d\xc3\x12\x5f\xf2\xf2\xe9\x5b\xea\xa4\x45\x82\x06\x08\xec\x16\x3d\x1a\x14\xb5\x92\xd6\xa6\x48\x76\x97\x4c\xe2\x7f\x5f\x50\xb6\x63\x19\x48\x6f\xc2\xcc\xee\x6a\xb8\xb3\x93\x8b\xb9\x7b\x05\x62\xf1\x04\xe1\x0b\x29\xb4\x2c\x1e\xef\x1f\x78\x26\x1e\x6d\x00\x63\xf0\x69\x2a\x16\xb1\xda\x3e\xa3\x85\xa9\x78\xe9\xfc\x32\x38\xea\xa7\xe2\xce\xfb\xb9\xab\x13\xb4\x9d\x77\x2a\x21\xf3\xef\xe8\xec\x54\xdc\xd9\x9a\x1c\xd6\x62\x19\x62\x8d\x4e\x28\x5b\x8b\x5f\x50\x71\xea\xca\x72\xb1\x80\x06\x08\xac\x86\x99\xe8\x42\xf0\x3c\x93\x12\x77\xff\x59\x17\x1c\xbd\x77\x14\xca\x35\x84\x6a\x10\x52\x6a\xd7\xcb\x4e\x4b\xb0\x45\x64\xa9\x28\xa0\x36\xc0\xf2\xfc\xbf\xab\xcb\x8b\x8b\x9b\xff\x6f\xb3\x2c\x17\x3f\x19\xa8\x60\x0f\x1a\x1b\xd4\x82\x43\x6c\x9a\x59\x56\x62\x0d\x4a\x4e\x26\xf2\xcd\xd1\x86\xbd\xd2\x50\xbe\xf7\xe6\x08\x07\xc5\x1b\x1e\x41\x35\xea\x80\xce\x2a\x42\xe0\x34\x74\x09\x96\x31\xe0\x2b\x08\x47\xa2\xc3\xb6\x2b\x74\x17\xc9\x8a\x06\x0d\xf0\x68\x7c\xad\x82\x5a\xba\x48\x1a\x58\x7e\x8a\x96\x58\xf3\xe7\xc4\x89\x9e\x31\x61\x9c\x56\xe6\x94\xe6\xdf\xe6\xfe\xaf\xad\x5b\xab\x7a\xd4\xa7\x60\xc4\x7b\x60\x6c\x2d\xd0\x80\x67\xb9\xf8\x46\xaa\x36\x30\x92\xde\x0e\xc0\x69\x9b\xc1\x8a\x3e\x76\x30\x7f\x56\x1b\xc8\x74\xaf\x36\x50\x54\x11\x4d\x5d\xd4\x50\xc5\x56\x26\xee\xd9\xd9\xd6\x89\x87\x77\x6f\x1c\x01\x09\x6f\x62\x8b\x76\x34\xbc\x4f\xfc\x12\x42\x40\xdb\xf2\x5e\x42\x2e\xbe\xa2\x81\xa2\x52\x0c\xb5\xf0\xe4\xd6\xa0\x83\x68\x1c\xf5\x2a\xcc\xb2\x49\x89\x6f\x3c\x14\xbd\x0c\xb3\x8e\x8e\xee\x57\x9e\xe5\x1f\xf7\x98\x49\x17\xc3\x20\xa3\xf7\x60\x82\xb3\x60\x25\x57\xa1\x48\x3f\xdf\x4b\xd9\x29\x59\xf5\xae\x8e\xe9\x60\x52\xed\xd3\xe3\xe2\xee\xc0\xaa\x60\x14\x33\x2a\x9b\x7a\x8a\x1d\x78\x58\xd4\x3c\x12\x27\xe3\xe7\xc6\xad\x23\xc1\xc9\x40\x49\xe0\x0d\x07\x15\xe0\x50\x9d\x92\xb1\x2f\x19\x2e\xfd\x90\x94\x4c\x96\xa4\x36\xf0\x23\xdd\xd9\x30\x95\x14\x77\x66\x1b\x50\xf3\xa1\xfc\x9f\xc6\xd1\x67\x61\x39\x3c\xf3\xdf\x4c\xbb\x7e\xa5\x8f\x8d\x2b\x78\x4f\xf1\x58\x71\xa0\x8f\xb5\x8e\xe8\xd2\x93\xf3\x40\x21\xd9\x37\x82\x77\xde\x8d\xc9\x46\x55\x84\x7a\x8c\x64\x79\x5a\xfc\x3e\xda\xe2\x45\x05\xdd\x89\x3c\xcf\x93\x6e\xd7\xf7\x60\x83\x58\x80\x62\x67\x8f\x99\x6d\x31\x74\xb1\x1a\xf2\xb9\x76\x50\x19\x15\x13\x84\xad\x75\x04\x25\x3a\x89\xcc\x11\x58\x9e\xdd\x5c\xe5\xc3\xa7\xde\xcd\x29\xce\xcf\x2e\x6f\x6f\xae\xaf\xcf\xcf\xd2\x52\x26\x25\xf6\x26\xd9\xb8\xb3\x69\x78\x50\x2e\x76\x9b\xee\x91\xf5\x1e\x98\x94\xe8\x69\x48\x65\x4a\xa8\x41\x1b\x4e\x4d\xe1\x03\xfc\x27\x00\x00\xff\xff\xf8\xb0\x11\x91\xca\x04\x00\x00")
+
+func confGitignorePhpstormBytes() ([]byte, error) {
+	return bindataRead(
+		_confGitignorePhpstorm,
+		"conf/gitignore/PhpStorm",
+	)
+}
+
+func confGitignorePhpstorm() (*asset, error) {
+	bytes, err := confGitignorePhpstormBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "conf/gitignore/PhpStorm", size: 1226, mode: os.FileMode(420), modTime: time.Unix(1520373345, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
 var _confGitignorePlayframework = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x44\xc8\x31\x6e\xc3\x30\x0c\x05\xd0\xfd\x9f\x42\x85\x37\x03\x15\xcf\xd1\xad\x57\xb0\x25\x42\x65\x43\x59\x02\x49\x27\xf0\xed\x33\x19\x99\x1e\xf0\x96\xf4\xd3\x8e\x61\x9c\x7e\x75\xbb\xbe\xd2\x6b\xd8\x43\x8e\x96\xaa\x18\x97\x18\x76\xa5\x05\xbb\x1c\x04\xaa\x3b\x32\x17\x95\xe9\x0c\x52\xd9\x09\xa4\xa3\x39\x81\xfa\xa8\xa7\xb2\x83\xa6\x8d\x7f\x2e\x71\xfb\x89\xd8\xac\x71\xe0\x36\xfa\x24\x04\x7b\x7c\x1b\xfb\xa9\x01\x67\x7b\xb2\xe5\x29\x15\x6b\x96\xae\x58\x33\x77\x05\x55\xf1\x20\xe4\xb2\x95\x3f\xc6\x3b\x00\x00\xff\xff\xb1\xed\x52\xdf\xaa\x00\x00\x00")
 
 func confGitignorePlayframeworkBytes() ([]byte, error) {
@@ -3417,6 +3439,26 @@ func confGitignoreWebmethods() (*asset, error) {
 	return a, nil
 }
 
+var _confGitignoreWebstorm = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x53\x4d\x6f\xdb\x3a\x10\xbc\xeb\x57\x10\xd0\xe5\x3d\xc3\x12\x5f\xf2\xf2\xe9\x5b\xea\xa4\x45\x82\x06\x08\xec\x16\x3d\x1a\x14\xb5\x92\xd6\xa6\x48\x76\x97\x4c\xe2\x7f\x5f\x50\xb6\x63\x19\x48\x6f\xc2\xcc\xee\x6a\xb8\xb3\x93\x8b\xb9\x7b\x05\x62\xf1\x04\xe1\x0b\x29\xb4\x2c\x1e\xef\x1f\x78\x26\x1e\x6d\x00\x63\xf0\x69\x2a\x16\xb1\xda\x3e\xa3\x85\xa9\x78\xe9\xfc\x32\x38\xea\xa7\xe2\xce\xfb\xb9\xab\x13\xb4\x9d\x77\x2a\x21\xf3\xef\xe8\xec\x54\xdc\xd9\x9a\x1c\xd6\x62\x19\x62\x8d\x4e\x28\x5b\x8b\x5f\x50\x71\xea\xca\x72\xb1\x80\x06\x08\xac\x86\x99\xe8\x42\xf0\x3c\x93\x12\x77\xff\x59\x17\x1c\xbd\x77\x14\xca\x35\x84\x6a\x10\x52\x6a\xd7\xcb\x4e\x4b\xb0\x45\x64\xa9\x28\xa0\x36\xc0\xf2\xfc\xbf\xab\xcb\x8b\x8b\x9b\xff\x6f\xb3\x2c\x17\x3f\x19\xa8\x60\x0f\x1a\x1b\xd4\x82\x43\x6c\x9a\x59\x56\x62\x0d\x4a\x4e\x26\xf2\xcd\xd1\x86\xbd\xd2\x50\xbe\xf7\xe6\x08\x07\xc5\x1b\x1e\x41\x35\xea\x80\xce\x2a\x42\xe0\x34\x74\x09\x96\x31\xe0\x2b\x08\x47\xa2\xc3\xb6\x2b\x74\x17\xc9\x8a\x06\x0d\xf0\x68\x7c\xad\x82\x5a\xba\x48\x1a\x58\x7e\x8a\x96\x58\xf3\xe7\xc4\x89\x9e\x31\x61\x9c\x56\xe6\x94\xe6\xdf\xe6\xfe\xaf\xad\x5b\xab\x7a\xd4\xa7\x60\xc4\x7b\x60\x6c\x2d\xd0\x80\x67\xb9\xf8\x46\xaa\x36\x30\x92\xde\x0e\xc0\x69\x9b\xc1\x8a\x3e\x76\x30\x7f\x56\x1b\xc8\x74\xaf\x36\x50\x54\x11\x4d\x5d\xd4\x50\xc5\x56\x26\xee\xd9\xd9\xd6\x89\x87\x77\x6f\x1c\x01\x09\x6f\x62\x8b\x76\x34\xbc\x4f\xfc\x12\x42\x40\xdb\xf2\x5e\x42\x2e\xbe\xa2\x81\xa2\x52\x0c\xb5\xf0\xe4\xd6\xa0\x83\x68\x1c\xf5\x2a\xcc\xb2\x49\x89\x6f\x3c\x14\xbd\x0c\xb3\x8e\x8e\xee\x57\x9e\xe5\x1f\xf7\x98\x49\x17\xc3\x20\xa3\xf7\x60\x82\xb3\x60\x25\x57\xa1\x48\x3f\xdf\x4b\xd9\x29\x59\xf5\xae\x8e\xe9\x60\x52\xed\xd3\xe3\xe2\xee\xc0\xaa\x60\x14\x33\x2a\x9b\x7a\x8a\x1d\x78\x58\xd4\x3c\x12\x27\xe3\xe7\xc6\xad\x23\xc1\xc9\x40\x49\xe0\x0d\x07\x15\xe0\x50\x9d\x92\xb1\x2f\x19\x2e\xfd\x90\x94\x4c\x96\xa4\x36\xf0\x23\xdd\xd9\x30\x95\x14\x77\x66\x1b\x50\xf3\xa1\xfc\x9f\xc6\xd1\x67\x61\x39\x3c\xf3\xdf\x4c\xbb\x7e\xa5\x8f\x8d\x2b\x78\x4f\xf1\x58\x71\xa0\x8f\xb5\x8e\xe8\xd2\x93\xf3\x40\x21\xd9\x37\x82\x77\xde\x8d\xc9\x46\x55\x84\x7a\x8c\x64\x79\x9e\xa7\x90\x0e\xd1\x16\x2f\x2a\xe8\x4e\xe4\x79\x9e\x74\xbb\xbe\x07\x1b\xc4\x02\x14\x3b\x7b\xcc\x6c\x8b\xa1\x8b\xd5\x90\xcf\xb5\x83\xca\xa8\x98\x20\x6c\xad\x23\x28\xd1\x49\x64\x8e\xc0\xf2\xec\xe6\x2a\x1f\x3e\xf5\x6e\x4e\x71\x7e\x76\x79\x7b\x73\x7d\x7d\x7e\x96\x96\x32\x29\xb1\x37\xc9\xc6\x9d\x4d\xc3\x83\x72\xb1\xdb\x74\x8f\xac\xf7\xc0\xa4\x44\x4f\x43\x2a\x53\x42\x0d\xda\x70\x6a\x0a\x1f\xe0\x3f\x01\x00\x00\xff\xff\x04\x06\xbc\x87\xca\x04\x00\x00")
+
+func confGitignoreWebstormBytes() ([]byte, error) {
+	return bindataRead(
+		_confGitignoreWebstorm,
+		"conf/gitignore/WebStorm",
+	)
+}
+
+func confGitignoreWebstorm() (*asset, error) {
+	bytes, err := confGitignoreWebstormBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "conf/gitignore/WebStorm", size: 1226, mode: os.FileMode(420), modTime: time.Unix(1520373345, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
 var _confGitignoreWindows = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x4c\x8e\x4d\x6a\xc3\x30\x10\x46\xf7\x73\x8a\x01\x77\xe5\x85\x7a\x07\xbb\x2e\x18\x4a\x17\xa6\x50\xb2\x94\xa5\xb1\x35\x58\x3f\x46\x23\x13\x72\xfb\x60\x85\x84\x6c\x1e\xb3\x78\x6f\xf8\x1a\xfc\xe7\x68\xd3\x55\x90\x83\x5e\x09\x17\xf6\x84\x46\x1b\x47\x02\x7f\xee\x08\xb3\x28\x3b\x03\xb9\xf2\xba\xa1\xc1\xef\xe4\x2d\x65\x34\x29\x2e\xbc\xd6\x04\xbe\x48\xb6\x92\x76\xc5\x91\x4f\x63\x22\x73\x33\x9e\xb0\xe3\x88\x87\x90\xc5\x14\x1f\xaf\xc5\xe9\x4c\x02\x1f\xd3\xd0\x5f\xfa\x9f\x41\x75\xe3\xef\xe7\x19\x3c\x57\x8c\x51\x8a\xf6\x9e\x72\xd5\x05\x5a\x65\xf4\x0c\xad\x0a\xc2\x95\xa1\x72\x7f\x4f\xc4\xa5\x5c\xcc\x51\x4e\xd9\xc7\x0d\xee\x01\x00\x00\xff\xff\xea\xee\xa5\x7f\xd3\x00\x00\x00")
 
 func confGitignoreWindowsBytes() ([]byte, error) {
@@ -5056,6 +5098,7 @@ var _bindata = map[string]func() (*asset, error){
 	"conf/gitignore/Packer": confGitignorePacker,
 	"conf/gitignore/Perl": confGitignorePerl,
 	"conf/gitignore/Phalcon": confGitignorePhalcon,
+	"conf/gitignore/PhpStorm": confGitignorePhpstorm,
 	"conf/gitignore/PlayFramework": confGitignorePlayframework,
 	"conf/gitignore/Plone": confGitignorePlone,
 	"conf/gitignore/Prestashop": confGitignorePrestashop,
@@ -5105,6 +5148,7 @@ var _bindata = map[string]func() (*asset, error){
 	"conf/gitignore/VisualStudioCode": confGitignoreVisualstudiocode,
 	"conf/gitignore/Waf": confGitignoreWaf,
 	"conf/gitignore/WebMethods": confGitignoreWebmethods,
+	"conf/gitignore/WebStorm": confGitignoreWebstorm,
 	"conf/gitignore/Windows": confGitignoreWindows,
 	"conf/gitignore/WordPress": confGitignoreWordpress,
 	"conf/gitignore/Xcode": confGitignoreXcode,
@@ -5330,6 +5374,7 @@ var _bintree = &bintree{nil, map[string]*bintree{
 			"Packer": &bintree{confGitignorePacker, map[string]*bintree{}},
 			"Perl": &bintree{confGitignorePerl, map[string]*bintree{}},
 			"Phalcon": &bintree{confGitignorePhalcon, map[string]*bintree{}},
+			"PhpStorm": &bintree{confGitignorePhpstorm, map[string]*bintree{}},
 			"PlayFramework": &bintree{confGitignorePlayframework, map[string]*bintree{}},
 			"Plone": &bintree{confGitignorePlone, map[string]*bintree{}},
 			"Prestashop": &bintree{confGitignorePrestashop, map[string]*bintree{}},
@@ -5379,6 +5424,7 @@ var _bintree = &bintree{nil, map[string]*bintree{
 			"VisualStudioCode": &bintree{confGitignoreVisualstudiocode, map[string]*bintree{}},
 			"Waf": &bintree{confGitignoreWaf, map[string]*bintree{}},
 			"WebMethods": &bintree{confGitignoreWebmethods, map[string]*bintree{}},
+			"WebStorm": &bintree{confGitignoreWebstorm, map[string]*bintree{}},
 			"Windows": &bintree{confGitignoreWindows, map[string]*bintree{}},
 			"WordPress": &bintree{confGitignoreWordpress, map[string]*bintree{}},
 			"Xcode": &bintree{confGitignoreXcode, map[string]*bintree{}},

templates/.VERSION

@@ -1 +1 @@
-0.11.35.0306
+0.11.36.0306