ccd0 610de06238 Merge branch 'Stable' into Beta ...

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

2014-12-11 08:32:53 -08:00

..

QR.captcha.coffee

Merge branch 'Stable' into Beta

2014-12-11 08:32:53 -08:00

QR.coffee

Merge branch 'Stable' into Beta

2014-12-11 08:32:53 -08:00

QR.cooldown.coffee

QR cooldown no longer depends on Javascript being enabled.

2014-11-11 21:39:19 -08:00

QR.persona.coffee

remove "Remember Subject"

2014-08-23 15:11:47 -07:00

QR.post.coffee

Revert "Merge branch 'old-captcha'; allow selection of old or new captcha."

2014-12-10 14:30:29 -08:00