Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
yflory 2017-08-29 11:03:05 +02:00
commit 642dc17910
2 changed files with 2 additions and 1 deletions

View File

@ -596,7 +596,7 @@ define([
var origin = config.metadataMgr.getPrivateData().origin;
var href = inDrive ? origin+'/index.html' : origin+'/drive/';
var href = inDrive.test(origin) ? origin+'/index.html' : origin+'/drive/';
var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
var $aTag = $('<a>', {

View File

@ -234,5 +234,6 @@ define([
Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
}
});
Cryptpad.reportAppUsage();
});
});