Merge branch 'develop' into pr/csrf-token

This commit is contained in:
Kijin Sung 2017-03-13 16:35:24 +09:00
commit a3ef122b57
68 changed files with 2115 additions and 1361 deletions

View file

@ -57,7 +57,7 @@
var https_port = {Context::get("_https_port") ?: 'null'};
var enforce_ssl = {Context::get('_use_ssl') === 'always' ? 'true' : 'false'};
var ssl_actions = {json_encode(array_keys(Context::getSSLActions()))};
var xeVid = {json_encode($vid ?: null)};
var xeVid = null;
</script>
</head>