Update archives.json

p-perverts
Merge pull request #1391 from voh/patch-1

Update archives.json
Merge branch 'json' into ajson

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Features/Index-navlinks.html
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/Gallery.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
That didn't work as expected.
Merge branch 'json' into ajson
Don't know how I missed that while merging...
Reduce number of loops in Redirect
Fix duplicate backlinks
Merge branch 'v3' into ajson

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
Holy, how tired was I when I did that? Damn.
Get hash navigation working with Navigate.navigate()
return
Let Index.update handle its own page functions
Merge branch 'v3'
Fix Mascot dialog
Release appchan x v2.8.0.
Make a few changes specific to the fixed header
Close #239
Holy shit fuck me with a chainsaw I'm so retarded I deserve it
(but really plz don't, I'm just tired and this is a tired-zix commit)
Halp
Merge zixaphirs typo fix
Close #237
Start work on infinite scrolling