Merge branch 'staging' into serviceworker

This commit is contained in:
yflory committed 2018-06-11 10:17:50 +02:00
commit 996245ec3d
17 files changed
+571 -159

No files matched your search

+1 -1
View File
@@ -111,7 +111,7 @@ define([
// RPC may not be responding
// Send a report that can be handled manually
console.error(obj.error);
Feedback.send('ERROR_DELETING_OWNED_PAD=' + channelId, true);
Feedback.send('ERROR_DELETING_OWNED_PAD=' + channelId + '|' + obj.error, true);
}
});
}