Zixaphir 64c9c139c1 Merge branch 'v3' ...

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Images/FappeTyme.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee

2014-06-22 07:13:41 -07:00

..

icon16.png

Update .crx

2014-02-13 18:37:20 +01:00

icon48.png

Update .crx

2014-02-13 18:37:20 +01:00

icon128.png

Merge branch 'v3'

2013-08-15 23:02:54 -07:00

manifest.json

Release appchan x v2.9.29.

2014-05-29 10:39:09 -07:00

script.js

Merge branch 'v3'

2014-06-22 07:13:41 -07:00