Zixaphir 2c2a40c0c9 Merge branch 'v3' ...

Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	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/Config.coffee

2013-06-01 09:00:56 -07:00

..

Archive

Mayhem X, update changelog

2013-05-20 15:13:06 -07:00

Filtering

Merge branch 'v3'

2013-06-01 09:00:56 -07:00

General

Merge branch 'v3'

2013-06-01 09:00:56 -07:00

Images

Merge branch 'v3'

2013-05-27 14:22:31 -07:00

Linkification

Vimeo, Liveleak, and Vocaroo wmodes

2013-05-25 13:40:35 -07:00

Menu

Merge branch 'v3'

2013-05-20 17:06:30 -07:00

Miscellaneous

Merge branch 'v3'

2013-05-28 06:46:31 -07:00

Monitoring

Merge branch 'v3'

2013-05-27 14:22:31 -07:00

Posting

Yeah, this will probably break a lot...

2013-05-31 16:55:30 -07:00

Quotelinks

Merge branch 'v3'

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

Theming

cleaner return

2013-06-01 06:27:21 -07:00