ccd0 afa6ec9dd4 Merge branch 'bstable' into bbeta ...

Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json

2015-01-27 10:52:15 -08:00

..

Archive

Merge remote-tracking branch 'archives/master'

2015-01-23 14:50:39 -08:00

Filtering

Make reply hiding button insertion more efficient.

2015-01-12 00:14:26 -08:00

General

Merge branch 'bstable' into bbeta

2015-01-26 23:22:24 -08:00

Images

Fix a bunch of feature initialization conditions.

2015-01-26 02:57:55 -08:00

Linkification

Fix #826

2015-01-25 13:30:08 -08:00

Menu

newlines

2015-01-25 10:25:15 -08:00

Miscellaneous

Fix merge mistake.

2015-01-26 03:42:03 -08:00

Monitoring

Fix whenModified argument.

2015-01-24 15:51:05 -08:00

Posting

Merge branch 'bstable' into bbeta

2015-01-27 10:52:15 -08:00

Quotelinks

Revert "Fix quotelinks on /pol/."

2015-01-08 19:35:24 -08:00