|
|
@ -1582,7 +1582,11 @@
|
|
|
|
"Tumblr": {
|
|
|
|
"Tumblr": {
|
|
|
|
"cats": [ 11 ],
|
|
|
|
"cats": [ 11 ],
|
|
|
|
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
|
|
|
|
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
|
|
|
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
|
|
|
|
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
"url": "^(www.)?[^/]+\\.tumblr\\.com",
|
|
|
|
|
|
|
|
>>>>>>> 7cd3684... More strict patterns
|
|
|
|
"headers": { "X-Tumblr-Usec": ".*" }
|
|
|
|
"headers": { "X-Tumblr-Usec": ".*" }
|
|
|
|
},
|
|
|
|
},
|
|
|
|
"Twilight CMS": {
|
|
|
|
"Twilight CMS": {
|
|
|
|