Merge remote-tracking branch 'origin/master' into notificationOnFakeReadout

Browse source

Conflicts:
	canvasblocker.xpi
	data/inject.js
	lib/main.js

...

This commit is contained in:

kkapsner 2015-04-15 12:11:51 +02:00

parent e51c5644ad e639b863dd

commit a8f636ba6f

3 changed files with 29 additions and 50 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

canvasblocker.xpi

View file

Binary file not shown.