Zixaphir 7fb48b93d4 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 ...

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json

2013-11-23 11:17:11 -07:00

..

3.12.0

Add sub-menu preview in the changelog.

2013-11-03 17:59:25 +01:00