ccd0 c70921e176 Merge branch 'master' into zixaphir-merge ...

Conflicts:
	src/Filtering/Filter.coffee
	src/General/Index.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee

2015-02-01 13:41:36 -08:00

..

Captcha.coffee

Merge commit '68dbb73' into noscript; allow selection of noscript or Javascript captcha.

2014-12-12 17:59:14 -08:00

Captcha.noscript.coffee

Merge from Appchan X: Whitespace and other changes not affecting compiled script.

2015-01-31 02:50:38 -08:00

Captcha.v2.coffee

Revert "Temporarily hard-enable captcha on /b/."

2015-01-04 00:09:26 -08:00

QR.coffee

Merge branch 'master' into zixaphir-merge

2015-02-01 13:41:36 -08:00

QR.cooldown.coffee

Reduce code duplication with Get.scriptData.

2014-12-20 12:31:15 -08:00

QR.persona.coffee

Remove /pol/ flags properly.

2015-01-25 14:57:39 -08:00

QR.post.coffee

Merge from Appchan X: Whitespace and other changes not affecting compiled script.

2015-01-31 02:50:38 -08:00