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

..

icon16.png

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

icon48.png

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

icon128.png

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

manifest.json

Release 4chan X v1.3.0.

2014-01-10 09:46:48 -07:00

script.js

Merge branch 'json' into ajson

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