Go to file

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

builds

Merge branch 'v3' into Av2

2013-04-22 21:41:24 -07:00

src

Merge branch 'v3' into Av2

2013-04-22 21:41:24 -07:00

.gitattributes

Start my quest to integrate 4chan-X V3

2013-03-12 03:53:57 -07:00

.gitignore

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3