Merge branch 'develop' into feature/inline-preview

This commit is contained in:
Wolfgang Rumpler 2017-07-24 19:32:57 +02:00
commit 6974332ebe
2 changed files with 2 additions and 2 deletions

View file

@ -109,7 +109,7 @@ let HistoryController = new Lang.Class({
* Clear the history and delete all photos except the current one.
* @returns {boolean}
*/
clear() {
clear: function() {
let firstHistoryElement = this.history[0];
if (firstHistoryElement)

View file

@ -11,7 +11,7 @@ let Logger = new Lang.Class({
},
_log: function(level, message) {
global.log(`${this._prefix} [${level}] >> ${this._callingClass} :: ${message}`);
global.log(this._prefix + " [" + level + "] >> " + this._callingClass + " :: " + message);
},
debug: function (message) {