Migrations
/
wappalyzer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manual merge

Browse Source
main
Elbert Alias 11 years ago
parent 3367347066
commit a7437e0926
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File

3
share/apps.json
Unescape View File

@ -1060,13 +1060,10 @@
"Google AdSense": { "Google AdSense": {
"website": "google.com/adsense", "website": "google.com/adsense",
"cats": [ 36 ], "cats": [ 36 ],
<<<<<<< HEAD
"env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ], "env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ],
"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ] "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ]
=======
"env": [ "^google_ad_" ], "env": [ "^google_ad_" ],
"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick.net" ] "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick.net" ]
>>>>>>> 96d095b... Escaped dots in AlloyUI and Google Adsense regular expressions.
}, },
"Google App Engine": { "Google App Engine": {
"website": "code.google.com/appengine", "website": "code.google.com/appengine",