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
..
chromium	Consistency with change made in 23083e9d	2015-03-09 19:28:48 -06:00
firefox	Merge branch 'master' of https://github.com/gorhill/uBlock	2015-03-10 18:34:16 +00:00
opera	new version	2015-03-04 19:26:46 -05:00
safari	More µ to u	2015-03-09 22:00:48 -06:00