Zixaphir
b0e1748f0c
Merge branch 'v3' into Av2
...
Conflicts:
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx.crx
builds/crx/manifest.json
builds/crx/script.js
css/style.css
package.json
src/features.coffee
src/main.coffee
src/qr.coffee
2013-04-16 14:16:49 -07:00
Zixaphir
0e103f0526
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
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...
2013-04-15 23:11:22 -07:00
Zixaphir
30880e499a
Merge branch 'v3' into Av2
...
Conflicts:
builds/4chan-X.meta.js
css/style.css
lib/ui.coffee
package.json
src/features.coffee
src/qr.coffee
2013-04-14 15:36:26 -07:00
Zixaphir
739220ed11
Expose builds/ because botnets.
2013-04-14 01:03:07 -07:00
