Zixaphir 81bd621d0d Merge branch 'v3' ...

Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Settings/Advanced.html

2013-05-23 15:51:51 -07:00

..

Archive

Mayhem X, update changelog

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

Filtering

Merge branch 'v3'

2013-05-15 09:00:09 -07:00

General

Merge branch 'v3'

2013-05-23 15:51:51 -07:00

Images

Merge branch 'v3'

2013-05-23 15:51:51 -07:00

Linkification

Lets... not store a useless RegExp string in memory.

2013-05-02 01:23:51 -07:00

Menu

Merge branch 'v3'

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

Miscellaneous

Merge branch 'v3'

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

Monitoring

Merge branch 'v3'

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

Posting

Merge branch 'v3'

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

Quotelinks

Merge branch 'v3'

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

Theming

Merge branch 'v3'

2013-05-10 02:41:08 -07:00