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

..

Index-navlinks.html

Start working on fixing things after the last merge

2014-02-28 14:48:24 -07:00

Settings-section-Main.html

Simplify import/export of settings.

2014-02-24 23:56:30 +01:00

Settings.html

Remove the <hr> below settings nav.

2014-02-25 01:02:00 +01:00