Fixed merge conflicts

main
ElbertF 13 years ago
commit 5d76f18685

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -51,6 +51,7 @@
'ATG Web Commerce': { cats: { 1: 6 }, headers: { 'X-ATG-Version': /ATG/i }, html: /<[^>]+_DARGS/ }, 'ATG Web Commerce': { cats: { 1: 6 }, headers: { 'X-ATG-Version': /ATG/i }, html: /<[^>]+_DARGS/ },
'Atlassian Confluence': { cats: { 1: 8 }, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/confluence/i }, 'Atlassian Confluence': { cats: { 1: 8 }, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/confluence/i },
'Atlassian Jira': { cats: { 1: 13 }, env: /^jira$/i, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i, implies: [ 'Java' ] }, 'Atlassian Jira': { cats: { 1: 13 }, env: /^jira$/i, html: /Powered by <a href=.http:\/\/www\.atlassian\.com\/software\/jira/i, implies: [ 'Java' ] },
'Alloy': { cats: { 1: 12 }, env: /^AUI$/ },
'AWStats': { cats: { 1: 10 }, meta: { 'generator': /AWStats/i } }, 'AWStats': { cats: { 1: 10 }, meta: { 'generator': /AWStats/i } },
'Banshee': { cats: { 1: 1, 2: 18 }, html: /Built upon the <a href=("|')[^>]+banshee-php\.org/i }, 'Banshee': { cats: { 1: 1, 2: 18 }, html: /Built upon the <a href=("|')[^>]+banshee-php\.org/i },
'Backbone.js': { cats: { 1: 12 }, script: /backbone.*\.js/, env: /^Backbone$/ }, 'Backbone.js': { cats: { 1: 12 }, script: /backbone.*\.js/, env: /^Backbone$/ },
@ -174,6 +175,7 @@
'Koobi': { cats: { 1: 1 }, meta: { 'generator': /Koobi/i } }, 'Koobi': { cats: { 1: 1 }, meta: { 'generator': /Koobi/i } },
'lighttpd': { cats: { 1: 22 }, headers: { 'Server': /lighttpd/i } }, 'lighttpd': { cats: { 1: 22 }, headers: { 'Server': /lighttpd/i } },
'LiveJournal': { cats: { 1: 11 }, url: /^(www.)?.+\.livejournal\.com/i }, 'LiveJournal': { cats: { 1: 11 }, url: /^(www.)?.+\.livejournal\.com/i },
'Liferay': { cats: { 1: 1 }, env: /^Liferay$/, headers: { 'Liferay-Portal': /.*/i } },
'Lotus Domino': { cats: { 1: 22 }, headers: { 'Server': /Lotus\-Domino/i } }, 'Lotus Domino': { cats: { 1: 22 }, headers: { 'Server': /Lotus\-Domino/i } },
'Magento': { cats: { 1: 6 }, script: /\/(js\/mage|skin\/frontend\/(default|enterprise))\//, env: /^(Mage|VarienForm)$/, implies: [ 'PHP '] }, 'Magento': { cats: { 1: 6 }, script: /\/(js\/mage|skin\/frontend\/(default|enterprise))\//, env: /^(Mage|VarienForm)$/, implies: [ 'PHP '] },
'Mambo': { cats: { 1: 1 }, meta: { 'generator': /Mambo/i } }, 'Mambo': { cats: { 1: 1 }, meta: { 'generator': /Mambo/i } },
@ -254,7 +256,7 @@
'RequireJS': { cats: { 1: 12 }, script: /require.*\.js/ , env: /^requirejs$/}, 'RequireJS': { cats: { 1: 12 }, script: /require.*\.js/ , env: /^requirejs$/},
'Ruby': { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby|mod_rails|mod_rack|Phusion.Passenger)/i, 'X-Powered-By': /(mod_rails|mod_rack|Phusion.Passenger)/i } }, 'Ruby': { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby|mod_rails|mod_rack|Phusion.Passenger)/i, 'X-Powered-By': /(mod_rails|mod_rack|Phusion.Passenger)/i } },
'S.Builder': { cats: { 1: 1 }, meta: { 'generator': /S\.Builder/i } }, 'S.Builder': { cats: { 1: 1 }, meta: { 'generator': /S\.Builder/i } },
's9y': { cats: { 1: 1 }, meta: { 'generator': /Serendipity/i } }, 's9y': { cats: { 1: 1 }, meta: { 'generator': /Serendipity/i, 'Powered-By': /Serendipity/i } },
'script.aculo.us': { cats: { 1: 12 }, script: /(scriptaculous|protoaculous)\.js/, env: /^Scriptaculous$/ }, 'script.aculo.us': { cats: { 1: 12 }, script: /(scriptaculous|protoaculous)\.js/, env: /^Scriptaculous$/ },
'Sencha Touch': { cats: { 1: 26, 2: 12}, script: /sencha\-touch.*\.js/ }, 'Sencha Touch': { cats: { 1: 26, 2: 12}, script: /sencha\-touch.*\.js/ },
'Seoshop': { cats: { 1: 6 }, html: /http:\/\/www\.getseoshop\.com/ }, 'Seoshop': { cats: { 1: 6 }, html: /http:\/\/www\.getseoshop\.com/ },
@ -336,7 +338,7 @@
'YaBB': { cats: { 1: 2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i }, 'YaBB': { cats: { 1: 2 }, html: /Powered by <a href=("|')[^>]+yabbforum/i },
'Yahoo! Web Analytics': { cats: { 1: 10 }, script: /d\.yimg\.com\/mi\/ywa\.js/ }, 'Yahoo! Web Analytics': { cats: { 1: 10 }, script: /d\.yimg\.com\/mi\/ywa\.js/ },
'Yandex.Metrika': { cats: { 1: 10 }, script: /mc\.yandex\.ru\/metrika\/watch\.js/ }, 'Yandex.Metrika': { cats: { 1: 10 }, script: /mc\.yandex\.ru\/metrika\/watch\.js/ },
'YouTube': { cats: { 1: 14 }, html: /<(param|embed)[^>]+youtube\.com\/v/i }, 'YouTube': { cats: { 1: 14 }, html: /<(param|embed|iframe)[^>]+youtube(-nocookie)?\.com\/(v|embed)/i },
'YUI Doc': { cats: { 1: 4 }, html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i }, 'YUI Doc': { cats: { 1: 4 }, html: /<html[^>]* yuilibrary\.com\/rdf\/[0-9.]+\/yui\.rdf/i },
'YUI': { cats: { 1: 12 }, script: /\/yui\/|yui\.yahooapis\.com/, env: /^YAHOO$/ }, 'YUI': { cats: { 1: 12 }, script: /\/yui\/|yui\.yahooapis\.com/, env: /^YAHOO$/ },
'Zen Cart': { cats: { 1: 6 }, meta: { 'generator': /Zen Cart/i } }, 'Zen Cart': { cats: { 1: 6 }, meta: { 'generator': /Zen Cart/i } },

Loading…
Cancel
Save