Zixaphir d8db801341 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/html/Settings/Advanced.html

2013-05-10 04:58:26 -07:00

..

icon16.png

Merge branch 'v3' into Av2

2013-04-14 15:36:26 -07:00

icon48.png

Merge branch 'v3' into Av2

2013-04-14 15:36:26 -07:00

icon128.png

Merge branch 'v3' into Av2

2013-04-14 15:36:26 -07:00

manifest.json

Release 4chan X v1.1.18.

2013-05-09 05:40:31 -07:00

script.js

Merge branch 'v3'

2013-05-10 04:58:26 -07:00