James Allen 9e525702c1 Merge branch 'master' into ja-restore-files 8 lat temu
..
acceptance 9e525702c1 Merge branch 'master' into ja-restore-files 8 lat temu
smoke 1f450085e9 Fix mocha complaining about returning Promise-like object 8 lat temu
unit 9e525702c1 Merge branch 'master' into ja-restore-files 8 lat temu
unit_frontend 0a1c543841 Hook up front end to restore documents 8 lat temu