Merge branch 'master' into ccd0merge

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2015-01-11 20:49:25 -07:00
commit 1fdd1ee64f
9 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,8 @@
### v2.9.44
*2015-01-09*
- Bugfixes.
### v2.9.43
*2014-12-14*

View File

@ -1,5 +1,5 @@
/*
* appchan x - Version 2.9.43 - 2015-01-11
* appchan x - Version 2.9.44 - 2015-01-11
*
* Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name appchan x
// @version 2.9.43
// @version 2.9.44
// @minGMVer 1.14
// @minFFVer 26
// @namespace zixaphir

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -1,6 +1,6 @@
{
"name": "appchan x",
"version": "2.9.43",
"version": "2.9.44",
"manifest_version": 2,
"description": "The most comprehensive 4chan userscript.",
"icons": {

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
{
"name": "appchan-x",
"version": "2.9.43",
"version": "2.9.44",
"description": "The most comprehensive 4chan userscript.",
"meta": {
"name": "appchan x",

View File

@ -2020,7 +2020,7 @@ a:only-of-type > .remove {
.hide-ads .middlead,
.hide-ads .bottomad,
.hide-ads .ad-plea,
.hide-ads body > .center {
.hide-ads .center {
display: none !important;
}
.shrink-ads .topad a img,