Commit graph

2 commits

Author SHA1 Message Date
James Allen
f94e33a3a9 Merge branch 'master' into ja-archive-ranges
Conflicts:
	app/coffee/DocArchiveManager.coffee
	test/acceptance/coffee/ArchiveDocsTests.coffee
2017-03-30 17:19:42 +01:00
Henry Oswald
dbfe5ac712 error if doc lines are not array when unarchiving 2017-03-09 17:34:33 +00:00
Renamed from services/docstore/test/unit/coffee/DocArchiveManager.coffee (Browse further)