Zixaphir a61e9e703f Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 ...

Conflicts:
	changelog-old
	json/archives.json
	src/Monitoring/ThreadUpdater.coffee

2013-05-12 07:00:30 -07:00

..

icon16.png

…

icon48.png

…

icon128.png

…

manifest.json

…

script.js

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

2013-05-12 07:00:30 -07:00