Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,882 Commits 2 Branches 0 Tags
Commit Graph

4 Commits

Author SHA1 Message Date
Zixaphir
bc501dc022 Merge branch 'v3' 
Conflicts:
	.gitignore
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/ImageExpand.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
 2013-08-15 23:02:54 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -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