Zixaphir 18d3d6b6e9 Merge branch 'v3' into json ...

Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/General/Main.coffee

2014-01-09 12:32:59 -07:00

..

audio

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

css

Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

2014-01-09 10:12:28 -07:00

html

Tweak the clear search button a bit

2014-01-09 03:33:47 -07:00

img

Changelog

2014-01-08 22:16:37 -07:00

lib

Yeah, that wouldn't be good to happen, but..

2014-01-08 12:02:08 -07:00

meta

Merge -- probably bugged until I sort out everything

2013-11-22 17:25:06 -07:00

Build.coffee

Merge Zixaphir X, close #221

2014-01-08 20:55:13 -07:00

Cheats.coffee

How did that even...?

2013-12-24 15:45:00 -07:00

Config.coffee

Shortcut icons now default

2014-01-08 21:14:21 -07:00

Get.coffee

Update for 4cdn, maybe fix issues like #219?

2014-01-07 02:27:40 -07:00

Globals.coffee

Merge Zixaphir X

2013-08-12 00:07:39 -07:00

Header.coffee

Reflows.

2014-01-08 15:40:57 -07:00

Index.coffee

Merge branch 'v3' into json

2014-01-09 12:32:59 -07:00

Main.coffee

Merge branch 'v3' into json

2014-01-09 12:32:59 -07:00

Settings.coffee

Update for 4cdn, maybe fix issues like #219?

2014-01-07 02:27:40 -07:00

UI.coffee

ThreadUpdater.disconnect()

2014-01-07 16:30:18 -07:00