Zixaphir 4b3f4d1baf Merge branch 'ccd0' into v3 ...

Conflicts:
	builds/crx.crx
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee

2014-04-12 18:02:25 -07:00

..

icon16.png

Update .crx

2014-02-13 18:37:20 +01:00

icon48.png

Update .crx

2014-02-13 18:37:20 +01:00

icon128.png

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

manifest.json

Merge branch 'ccd0' into v3

2014-04-12 18:02:25 -07:00

script.js

Merge branch 'ccd0' into v3

2014-04-12 18:02:25 -07:00