Zixaphir 34140232fb Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/General/lib/notice.class
	src/General/meta/metadata.js
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

worksforme.png

2013-11-23 12:56:42 -07:00

..

burichan.css

Undo watcher class change

2013-08-14 03:31:32 -07:00

dynamic.css

Fix #305

2013-08-17 23:37:21 -07:00

emoji.css

Eliminate unnecessary whitespace in compiled CSS.

2013-08-06 18:45:42 -07:00

emoji.sage.css

Rethink Emoji.

2013-06-06 07:19:46 -07:00

font-awesome.css

Merge branch 'v3'

2013-11-23 12:56:42 -07:00

jscolor.css

Apparently the syntax for linear gradients changed

2013-06-07 08:13:39 -07:00

layout.css

Fix #470

2013-10-14 08:29:29 -07:00

mascot.css

Fix mascot positionings

2013-06-20 21:06:33 -07:00

padding.nav.css

Fix Style.padding

2013-08-21 11:40:06 -07:00

padding.pages.css

Fix Style.padding

2013-08-21 11:40:06 -07:00

prettyprint.css

Merge branch 'v3' into Av2

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

style.css

Fix menu's CSS

2013-11-23 11:52:25 -07:00

theme.css

Get "slideout" UI working.

2013-08-20 00:20:29 -07:00

theme.import.css

Follow upstream and remove ".webkit" in favor of ".blink"

2013-08-05 12:01:26 -07:00

themeoptions.css

Merge branch 'v3'

2013-08-09 20:33:42 -07:00