4chan-x

History

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

Conflicts:
	CHANGELOG.md
	LICENSE
	css/style.css
	html/Monitoring/ThreadWatcher.html
	json/archives.json
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/img/favicons/empty.gif
	src/Linkification/Linkify.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee

2013-08-22 12:10:33 -07:00

Favicon.coffee

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

2013-08-22 12:10:33 -07:00

ThreadExcerpt.coffee

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

ThreadStats.coffee

Merge in new thread watcher and change a few things

2013-08-13 00:03:29 -07:00

ThreadUpdater.coffee

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