Zixaphir adaa09aaaa Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 ...

Fix some issues with previous merge.

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Header.coffee
	src/Linkification/Linkify.coffee

2013-12-06 17:11:36 -07:00

..

style.css

Only set the file info margin for replies, not OPs.

2013-12-07 00:22:25 +01:00