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

This commit is contained in:
yflory 2019-08-26 16:25:41 +02:00
commit 67fef6f764

View File

@ -894,7 +894,7 @@ MessengerUI, Messages) {
if (e) { return void console.error("Unable to get the pinned usage", e); }
if (overLimit) {
var key = 'pinLimitReachedAlert';
if (ApiConfig.noSubscriptionButton === true) {
if (!ApiConfig.allowSubscriptions) {
key = 'pinLimitReachedAlertNoAccounts';
}
$limit.show().click(function () {