Jordan Bates
|
894165f88b
|
Merge
|
2013-04-26 15:23:11 -07:00 |
|
Jordan Bates
|
ccc090e20c
|
Importing fixes
|
2013-04-26 15:21:07 -07:00 |
|
Zixaphir
|
7f081e8345
|
Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
builds/4chan-X.js
builds/4chan-X.user.js
builds/crx/script.js
|
2013-04-26 15:05:38 -07:00 |
|
Jordan Bates
|
70459850c1
|
Fix thread watcher dragging
|
2013-04-26 14:59:21 -07:00 |
|
Zixaphir
|
bfd879500f
|
Auto-hide.
|
2013-04-26 14:57:25 -07:00 |
|
Jordan Bates
|
e70514b6ec
|
Finish structure
|
2013-04-26 14:43:01 -07:00 |
|
Jordan Bates
|
86674a4c86
|
Merge branch 'v3' of https://github.com/zixaphir/appchan-x
|
2013-04-26 14:06:45 -07:00 |
|
Jordan Bates
|
09baa3feea
|
Merge Mayhem's structure
|
2013-04-26 14:04:12 -07:00 |
|