Zixaphir db5cccc70f Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;) ...

Conflicts:
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Settings-section-Main.html
	html/General/Settings.html
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadUpdater.coffee

2014-02-28 19:59:04 -07:00

..

crx

Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)

2014-02-28 19:59:04 -07:00

xpi

Update builds

2014-02-24 23:38:57 +01:00

4chan-X.js

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

4chan-X.meta.js

Merge

2014-02-24 23:35:11 +01:00

4chan-X.user.js

Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)

2014-02-28 19:59:04 -07:00

crx.crx

Update builds

2014-02-24 23:38:57 +01:00