Fixed merge

main
Elbert Alias 12 years ago
parent c72cc5b175
commit 6fdffeb898

@ -1641,7 +1641,7 @@
"cats": [ 6 ], "cats": [ 6 ],
"html": "<img[^>]*\/spree\/products\/[0-9]+\/.+>", "html": "<img[^>]*\/spree\/products\/[0-9]+\/.+>",
"html": "<link[^>]*\/assets\/store\/all\-[a-zA-Z0-9]{32}\.css.+>", "html": "<link[^>]*\/assets\/store\/all\-[a-zA-Z0-9]{32}\.css.+>",
"implies": [ "Ruby on Rails"] "implies": "Ruby on Rails"
}, },
"SQL Buddy": { "SQL Buddy": {
"cats": [ 3 ], "cats": [ 3 ],
@ -1676,7 +1676,7 @@
"Subrion": { "Subrion": {
"cats": [ 1 ], "cats": [ 1 ],
"headers": { "X-Powered-CMS": "Subrion CMS" }, "headers": { "X-Powered-CMS": "Subrion CMS" },
"implies": [ "PHP" ] "implies": "PHP"
}, },
"Supersized": { "Supersized": {
"cats": [ 7, 25 ], "cats": [ 7, 25 ],

Loading…
Cancel
Save