Merge remote-tracking branch 'origin/master'

2025-01-14 14:43:17 +08:00 · 2019-07-14 19:31:48 +02:00 · 2019-07-14 19:31:48 +02:00 · 845361736f
commit 845361736f
parent 0542f0b556 e8b243f0c8
2 changed files with 1592 additions and 1 deletions
--- a/backend/model/threading/DiskMangerWorker.ts
+++ b/backend/model/threading/DiskMangerWorker.ts
@ -116,7 +116,7 @@ export class DiskMangerWorker {

          return resolve(directory);
        } catch (err) {
-          return reject({error: err.toString()});
+          return reject({error: err});
        }

      });
--- a/frontend/translate/messages.fr.xlf
+++ b/frontend/translate/messages.fr.xlf