Zixaphir 7396b327c8 Merge branch 'v3' into Av2 ...

Conflicts:
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/Monitoring/ThreadWatcher.coffee

2013-05-07 21:09:24 -07:00

..

icon16.png

Merge branch 'v3' into Av2

2013-04-14 15:36:26 -07:00

icon48.png

Merge branch 'v3' into Av2

2013-04-14 15:36:26 -07:00

icon128.png

Merge branch 'v3' into Av2

2013-04-14 15:36:26 -07:00

manifest.json

Release 4chan X v1.1.15.

2013-05-07 15:53:44 -07:00

script.js

Merge branch 'v3' into Av2

2013-05-07 21:09:24 -07:00