Zixaphir bd08bd964d Merge branch 'json' into ajson ...

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Features/Index-navlinks.html
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/Gallery.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee

2014-01-11 15:55:46 -07:00

..

1.1.18.png

Merge Zixaphir X

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

1.2.0.png

Merge Zixaphir X

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

1.2.28-2.png

Update changelog

2013-08-14 05:17:43 -07:00

1.2.28.png

Update changelog

2013-08-14 05:17:43 -07:00

1.2.31.png

More optimizations + changelog

2013-08-16 02:24:24 -07:00

1.2.46.png

Changelog

2014-01-08 22:16:37 -07:00

2.0.2-qr.png

Merge branch 'v3'

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

2.3.6.png

changelog image

2013-08-21 13:18:30 -07:00