Conflicts: lib/$.coffee lib/ui.coffee src/config.coffee src/features.coffee src/main.coffee src/qr.coffee Also added a proper Chrome build. I'mma have to save my pem file...
Conflicts: builds/4chan-X.meta.js css/style.css lib/ui.coffee package.json src/features.coffee src/qr.coffee