Merge branch 'v3'

Conflicts:
	builds/crx/script.js
	src/General/Main.coffee
This commit is contained in:
Zixaphir 2013-08-04 23:13:55 -07:00
commit fc8d6c9498

View File

@ -10209,6 +10209,7 @@
};
}
Conf['selectedArchives'] = {};
Conf['CachedTitles'] = [];
$.get(Conf, Main.initFeatures);
$.on(d, '4chanMainInit', Main.initStyle);
return $.asap((function() {