2 Commits

Author SHA1 Message Date
Zixaphir
1662401958 Merge remote-tracking branch 'mayhem/v3' into v3
Conflicts:
	.gitattributes
	4chan-X.meta.js
	4chan-X.user.js
	Gruntfile.js
	lib/$.coffee
	src/config.coffee
	src/features.coffee
	src/globals.coffee
2013-03-28 20:42:02 -07:00
Nicolas Stepien
2666e07d3f Rename the old changelog file. #968 2013-03-24 17:52:39 +01:00