Zixaphir de26c643b2 Merge branch 'v3' into Av2 ...

Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/css/style.css
	src/features/filtering/replyhiding.coffee
	src/features/filtering/threadhiding.coffee
	src/features/misc/header.coffee
	src/settings.coffee

2013-04-22 23:48:42 -07:00

..

crx

Merge branch 'v3' into Av2

2013-04-22 23:48:42 -07:00

appchan-x.js

Merge branch 'v3' into Av2

2013-04-22 23:48:42 -07:00

appchan-x.meta.js

Merge branch 'v3' into Av2

2013-04-16 21:02:47 -07:00

appchan-x.user.js

Merge branch 'v3' into Av2

2013-04-22 23:48:42 -07:00

crx.crx

Redirect.to, modularized.

2013-04-22 18:25:30 -07:00