Zixaphir 4b8b9ad493 Merge branch 'v3' ...

Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	src/General/Settings.coffee

2013-05-14 13:15:39 -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.2.3.

2013-05-14 08:12:57 -07:00

script.js

Merge branch 'v3'

2013-05-14 13:15:39 -07:00