ea47aefd93
Conflicts: .gitignore CHANGELOG.md CONTRIBUTING.md LICENSE builds/appchan-x.user.js builds/crx/manifest.json builds/crx/script.js latest.js package.json src/General/Header.coffee src/General/Index.coffee src/General/Settings.coffee src/General/UI.coffee src/General/html/Settings/Settings.html src/Images/Gallery.coffee src/Images/ImageExpand.coffee src/Monitoring/ThreadWatcher.coffee
14 lines
151 B
Plaintext
14 lines
151 B
Plaintext
node_modules/
|
|
*~
|
|
*.db
|
|
tmp-crx/
|
|
tmp-userscript/
|
|
<<<<<<< HEAD
|
|
=======
|
|
testbuilds/
|
|
builds/4chan-X.zip
|
|
>>>>>>> v3
|
|
Gruntfile.js
|
|
builds/4chan-*
|
|
Gruntfile.js
|