Merge branch 'master' into index

Conflicts:
	src/General/Index.coffee
This commit is contained in:
ccd0 2015-07-18 20:53:45 -07:00
commit cc05931c76

View File

@ -647,6 +647,7 @@ Index =
if page isnt Index.currentPage
Index.currentPage = page
Index.pushState {page}
Index.setPage()
nodes = Index.buildSinglePage Index.currentPage
$.rmAll Index.root
$.rmAll Header.hover