Elbert Alias 8 years ago
parent 33c53bd639
commit f9b3fd53a8

@ -838,6 +838,7 @@
"cats": [ "cats": [
"47" "47"
], ],
<<<<<<< HEAD
"headers": { "headers": {
"Set-cookie": "FESESSIONID" "Set-cookie": "FESESSIONID"
}, },
@ -3776,7 +3777,7 @@
"js": { "js": {
"Hammer": "", "Hammer": "",
"Hammer.VERSION": "(.*)\\;version:\\1", "Hammer.VERSION": "(.*)\\;version:\\1",
"Ha.VERSION": "(.*)\\;version:\\1" "Ha.VERSION": "(.*)\\;version:\\1"
}, },
"icon": "Hammer.js.png", "icon": "Hammer.js.png",
"script": "hammer(?:\\.min)?\\.js", "script": "hammer(?:\\.min)?\\.js",