Zixaphir 94dd0e555f Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Menu/Menu.coffee

2014-01-13 13:25:43 -07:00

..

Archive

Merge zixaphirs typo fix

2014-01-12 00:57:36 -07:00

Filtering

Merge branch 'json' into ajson

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

General

Merge branch 'v3'

2014-01-13 13:25:43 -07:00

Images

Update font-awesome

2014-01-08 23:33:52 -07:00

Linkification

Merge branch 'v3'

2013-12-24 16:18:47 -07:00

Menu

Merge branch 'v3'

2014-01-13 13:25:43 -07:00

Miscellaneous

Merge branch 'v3'

2014-01-12 14:56:32 -07:00

Monitoring

Fix Favicon on Catalog

2014-01-12 19:44:47 -07:00

Posting

Finally make the Captcha Filter into an option

2014-01-12 13:56:11 -07:00

Quotelinks

Merge branch 'v3'

2014-01-13 13:25:43 -07:00

Theming

Delay Padding calculation until the header bar actually exists

2014-01-12 23:40:47 -07:00