ccd0 5413d0777b Merge branch 'bstable' ...

Conflicts:
	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-03-02 12:57:28 -08:00

..

Archive

Merge remote-tracking branch 'archives/master' into bstable

2015-03-02 12:52:47 -08:00

Filtering

Merge commit '8c17090b3dbc03d50f4e0cabc448eeb6a4e33076' into zixaphir-merge

2015-02-03 01:49:44 -08:00

General

Gallery menu shouldn't close on scroll.

2015-03-02 02:05:53 -08:00

Images

Fix header menu order. #339

2015-02-27 16:39:17 -08:00

Linkification

Fix HTTP links (from embedding) in inlined quotes.

2015-02-15 18:45:31 -08:00

Menu

Revert "Add Unique ID to archive search menu."

2015-02-20 17:14:19 -08:00

Miscellaneous

More unused argument cleanup.

2015-02-15 01:21:57 -08:00

Monitoring

Make thread watcher more robust against corrupt data. #341

2015-02-26 21:53:57 -08:00

Posting

Fix highlighting of filename field when selected.

2015-03-01 17:51:28 -08:00

Quotelinks

Fix header menu order. #339

2015-02-27 16:39:17 -08:00