Skip to content
Commit c964b7a2 authored by Benoit Pointet's avatar Benoit Pointet
Browse files

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	chrome/content/options.xul
	chrome/content/wappalyzer.js
parents 635cf361 abf3e5f2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment