uBlock/src
AlexVallat 62c8ffbcc4 Merge branch 'master' of https://github.com/gorhill/uBlock
Conflicts:
	platform/firefox/vapi-background.js
	src/_locales/en/messages.json
2015-03-10 18:34:16 +00:00
..
_locales Merge branch 'master' of https://github.com/gorhill/uBlock 2015-03-10 18:34:16 +00:00
css this fixes #954 2015-03-08 17:54:08 -04:00
img Closes #948 2015-03-10 00:27:15 -06:00
js Merge branch 'master' of https://github.com/gorhill/uBlock 2015-03-10 18:34:16 +00:00
lib this completes fix of #520 2015-02-24 13:48:03 -05:00
1p-filters.html More µ to u 2015-03-09 22:00:48 -06:00
3p-filters.html More µ to u 2015-03-09 22:00:48 -06:00
about.html More µ to u 2015-03-09 22:00:48 -06:00
asset-viewer.html More µ to u 2015-03-09 22:00:48 -06:00
background.html More µ to u 2015-03-09 22:00:48 -06:00
dashboard.html Initial UI support for Fennec 2015-03-02 18:49:34 +00:00
devtool-log.html More µ to u 2015-03-09 22:00:48 -06:00
devtools.html Initial UI support for Fennec 2015-03-02 18:49:34 +00:00
dyna-rules.html More µ to u 2015-03-09 22:00:48 -06:00
epicker.html code review 2015-03-05 21:17:09 -05:00
popup.html Merge branch 'master' of https://github.com/gorhill/uBlock 2015-03-10 18:34:16 +00:00
settings.html More µ to u 2015-03-09 22:00:48 -06:00
whitelist.html More µ to u 2015-03-09 22:00:48 -06:00