Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.9.1.x' into HEAD

Browse Source 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2014-09-09 10:44:52 -07:00
commit 158e38c2d2
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -35,6 +35,12 @@ Based on v1.9.1.8.
**ccd0** **ccd0**
- Pause offscreen WebM thumbnails, fix some bugs. - Pause offscreen WebM thumbnails, fix some bugs.
### v1.9.1.10
*2014-09-09*
**Worer**
- Remove mawa.re from archive list.
### v1.9.1.9 ### v1.9.1.9
*2014-09-07* *2014-09-07*

10
src/Archive/archives.json
View File

@ -70,14 +70,4 @@
"software": "foolfuuka", "software": "foolfuuka",
"boards": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"], "boards": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"],
"files": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"] "files": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"]
}, {
"uid": 16,
"name": "maware",
"domain": "archive.mawa.re",
"http": true,
"https": false,
"software": "foolfuuka",
"boards": ["t"],
"files": ["t"],
"imagehosts": ["http://archive.mawa.re/"]
}] }]