that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
changelog-old
css/style.css
html/General/Settings.html
html/Monitoring/ThreadUpdater.html
html/Monitoring/ThreadWatcher.html
html/Posting/QR.html
package.json
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/post.class
src/General/meta/manifest.json
src/Images/ImageExpand.coffee
src/Meta/banner.js
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/Keybinds.coffee
src/Miscellaneous/Nav.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
