7 Commits

Author SHA1 Message Date
ccd0
c4962b015a point to the issues page 2014-04-07 21:25:50 -07:00
ccd0
0a3bdbe2c9 fix spacing in settings 2014-04-07 21:22:07 -07:00
Zixaphir
f133da454d Fix settings dialog, customize reset button 2014-01-22 12:24:30 -07:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
2014-01-22 12:10:34 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Jordan Bates
b7087b249e These mistakes happen too often for me to not put them in .gitignore 2013-04-28 10:45:31 -07:00
Jordan Bates
4f779ae64d Merge Mayhem X 2013-04-28 10:37:12 -07:00