Zixaphir 1debf61f2e Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee

2013-05-14 11:40:38 -07:00

..

Advanced.html

Merge branch 'v3'

2013-05-14 11:40:38 -07:00

Batch-Mascot.html

More or less improve the mascot section code.

2013-05-08 05:35:52 -07:00

Batch-Theme.html

Some rethinking of how to handle theme and mascots sections.

2013-05-09 00:46:12 -07:00

Deleted-Theme.html

Some rethinking of how to handle theme and mascots sections.

2013-05-09 00:46:12 -07:00

Filter-guide.html

Merge Mayhem X

2013-04-28 10:37:12 -07:00

Filter-select.html

Merge Mayhem X

2013-04-28 10:37:12 -07:00

Keybinds.html

Merge Mayhem X

2013-04-28 10:37:12 -07:00

Mascot.html

Some rethinking of how to handle theme and mascots sections.

2013-05-09 00:46:12 -07:00

Sauce.html

Merge Mayhem X

2013-04-28 10:37:12 -07:00

Settings.html

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

Theme.html

Some rethinking of how to handle theme and mascots sections.

2013-05-09 00:46:12 -07:00