Zixaphir c4a008f402 Merge branch 'v3' ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css

2013-05-10 07:19:08 -07:00

..

changelog

Merge branch 'v3'

2013-05-10 07:19:08 -07:00

emoji

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

favicons

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

icons

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

links

Paste.installgentoo.net embedding

2013-05-01 12:58:05 -07:00

icon16.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

icon48.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

icon128.png

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00

icon.gif

Merge branch 'v3' into Av2

2013-04-28 21:20:22 -07:00