Merge branch 'master' of github.com:laurent22/joplin

pull/793/head
Laurent Cozic 2018-09-13 20:53:39 +01:00
commit 1b784fe3b0
1 changed files with 7 additions and 1 deletions

View File

@ -3,7 +3,13 @@ const Folder = require('lib/models/Folder.js');
class FoldersScreenUtils {
static async refreshFolders() {
let initialFolders = await Folder.all({ includeConflictFolder: true });
let initialFolders = await Folder.all({
includeConflictFolder: true,
order: [{
by: "title",
dir: "asc"
}]
});
this.dispatch({
type: 'FOLDER_UPDATE_ALL',