Merge branch 'development' into production

This commit is contained in:
Ilya Ig. Petrov 2017-06-13 16:02:42 +05:00
commit a9b658515a
2 changed files with 2 additions and 2 deletions

View File

@ -505,7 +505,7 @@ PROXY foobar.com:8080; # Not HTTP!`.trim()}
return proxyStringRaw return proxyStringRaw
.replace(/#.*$/mg, '') // Strip comments. .replace(/#.*$/mg, '') // Strip comments.
.replace(/\s*DIRECT\s*/g, '') // Remove DIRECT from old versions. .replace(/[^\S\r\n]*DIRECT[^\S\r\n]*/g, '') // Remove DIRECT from old versions.
.split( /(?:[^\S\r\n]*(?:;|\r?\n)+[^\S\r\n]*)+/g ) .split( /(?:[^\S\r\n]*(?:;|\r?\n)+[^\S\r\n]*)+/g )
.map( (p) => p.trim() ) .map( (p) => p.trim() )
.filter((p) => p) .filter((p) => p)

View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
const commonContext = { const commonContext = {
version: '1.1', version: '1.3',
}; };
exports.contexts = {}; exports.contexts = {};