Zixaphir 750ac760bb Merge branch 'v3' ...

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Header.coffee

2014-01-13 19:36:02 -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 19:36:02 -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 19:10:17 -07:00

Theming

Fix mascot positioning code.

2014-01-13 18:34:35 -07:00