Zixaphir 28eebe0183 Merge branch 'ccd0' into v3 ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee

2014-04-10 23:08:43 -07:00

..

crx

Merge branch 'ccd0' into v3

2014-04-10 23:08:43 -07:00

4chan-X.meta.js

Release 4chan X v1.7.7.

2014-04-10 08:59:12 -07:00

4chan-X.user.js

Merge branch 'ccd0' into v3

2014-04-10 23:08:43 -07:00

crx.crx

Release 4chan X v1.7.7.

2014-04-10 08:59:12 -07:00

updates.xml

Release 4chan X v1.7.7.

2014-04-10 08:59:12 -07:00