Zixaphir a0ef2f4076 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/config.coffee
	src/features.coffee

We don't actually use the "Header", so the "move header to bottom"
setting has been removed as it wouldn't do anything.
2013-04-09 08:15:40 -07:00
..