Manual merges

src/apps.json

@@ -593,13 +593,14 @@
         "angular": "",
         "angular.version.full": "(.*)\\;version:\\1"
       },
-      "icon": "AngularJS.svg",
+			"html": "<app[^>]+ng-version=\"([\\d.]+)\">\\;version:\\1",
+			"icon": "Angular.svg",
       "script": [
         "angular(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+(?:\\-?rc[.\\d]*)*)/angular(?:\\.min)?\\.js\\;version:\\1",
         "angular.*\\.js"
       ],
-      "website": "http://angularjs.org"
+      "website": "http://angular.io"
     },
     "Apache": {
       "cats": [
@@ -838,6 +839,7 @@
       "cats": [
         "47"
       ],
+<<<<<<< HEAD
       "headers": {
         "Set-cookie": "FESESSIONID"
       },
@@ -6252,6 +6254,20 @@
       "icon": "New Relic.png",
       "website": "http://newrelic.com"
     },
+		"NextGEN Gallery": {
+			"cats": [
+				"7"
+			],
+			"icon": "NextGEN Gallery.png",
+			"html": [
+				"<!-- <meta name=\"NextGEN\" version=\"([\\d.]+)\" /> -->\\;version:\\1"
+			],
+			"script": "/nextgen-gallery/js/",
+			"implies": [
+				"WordPress"
+			],
+			"website": "https://www.imagely.com/wordpress-gallery-plugin"
+		},
     "Next.js": {
       "cats": [
         "18",
@@ -7344,7 +7360,10 @@
       "cats": [
         "18"
       ],
-      "html": "<link[^>]+(?:([\\d.])+/)?pure(?:-min)?\\.css\\;version:\\1",
+			"html": [
+				"<link[^>]+(?:([\\d.])+/)?pure(?:-min)?\\.css\\;version:\\1",
+				"<div[^>]+class=\"[^\"]*pure-u-(?:sm-|md-|lg-|xl-)?\\d-\\d"
+			],
       "icon": "Pure CSS.png",
       "website": "http://purecss.io"
     },
@@ -9450,6 +9469,7 @@
       ],
       "html": [
         "<style>/\\*!\\* Bootstrap v(\\d\\.\\d\\.\\d)\\;version:\\1",
+        "<link[^>]+?href=[^\"]/css/([\\d.]+)/bootstrap\\.(?:min\\.)?css\\;version:\\1",
         "<link[^>]+?href=\"[^\"]*bootstrap(?:\\.min)?\\.css",
         "<div[^>]+class=\"[^\"]*glyphicon glyphicon-"
       ],
@@ -10437,7 +10457,7 @@
       "cats": [
         "2"
       ],
-      "html": "(?:jQuery\\.extend\\(true, XenForo|Forum software by XenForo&trade;|<!--XF:branding|<html[^>]+id=\"XenForo\")",
+      "html": "(?:jQuery\\.extend\\(true, XenForo|Forum software by XenForo™|<!--XF:branding|<html[^>]+id=\"XenForo\")",
       "icon": "XenForo.png",
       "website": "http://xenforo.com"
     },
@@ -11119,7 +11139,7 @@
       "script": [
         "jquery(?:\\-|\\.)([\\d.]*\\d)[^/]*\\.js\\;version:\\1",
         "/([\\d.]+)/jquery(?:\\.min)?\\.js\\;version:\\1",
-        "jquery.*\\.js(?:\\?ver=([\\d.]+))?\\;version:\\1"
+        "jquery.*\\.js(?:\\?ver(?:sion)?=([\\d.]+))?\\;version:\\1"
       ],
       "website": "http://jquery.com"
     },

src/icons/Angular.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-10 -10 120 120"><defs><filter id="a" x="-50%" y="-50%" width="200%" height="200%"><feOffset result="offOut" in="SourceAlpha"/><feGaussianBlur result="blurOut" in="offOut" stdDeviation="3"/><feComponentTransfer in="blurOut" result="opacityOut"><feFuncA type="linear" slope=".5"/></feComponentTransfer><feBlend in="SourceGraphic" in2="opacityOut"/></filter></defs><path d="M5 18.25l45-16L96 18l-7.5 59L50 98.25l-38-21z" filter="url(#a)" class="outline"/><path d="M5 18.25l45-16v96l-38-21z" fill="#de3641" class="left"/><path d="M50 2.25L96 18l-7.5 59L50 98.25z" fill="#b13138" class="right"/><path d="M50 13l29.25 62.5h-10L63 61.25H50v-8.5h9.5L50 33.1l-8 19.65h8v8.5H38.1L32.5 75.5H21.75z" fill="#fff" class="letter"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><path fill="#dd0031" d="M125 30L31.9 63.2l14.2 123.1L125 230l78.9-43.7 14.2-123.1z"/><path fill="#c3002f" d="M125 30v22.2-.1V230l78.9-43.7 14.2-123.1L125 30z"/><path fill="#fff" d="M125 52.1L66.8 182.6h21.7l11.7-29.2h49.4l11.7 29.2H183L125 52.1zm17 83.3h-34l17-40.9 17 40.9z"/></svg>