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

2 Commits

Author SHA1 Message Date
Zixaphir
3d07017708 Merge branch 'v3' into Av2 
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/config.coffee
	src/css/style.css
	src/features/misc/announcementhiding.coffee
	src/features/misc/header.coffee
	src/features/misc/keybinds.coffee
	src/main.coffee
	src/settings.coffee
 2013-04-22 21:41:24 -07:00
Zixaphir
6257982bf0 code > features 2013-04-21 17:49:35 -07:00