Zixaphir 6f6766b9a0 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	html/General/Settings-section-Rice.html

Also renamed ColorUserIDs.coffee to IDColor.coffee to better handle
IDColor conflicts between Mayhem's repo and ours
2013-10-16 13:53:47 -07:00
..
2013-08-12 00:07:39 -07:00
2013-10-03 16:49:16 -07:00