Zixaphir f103fd0301 Merge branch 'mayhem' into v3 ...

Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee

2014-06-22 07:04:25 -07:00

..

style.css

Bring back proper box model for the catalog.

2014-06-13 02:28:53 +02:00