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

This commit is contained in:
ansuz committed 2020-02-10 10:01:06 -05:00
commit cff663e876
2 files changed
+7 -1

No files matched your search

+1 -1
View File
@@ -38,7 +38,7 @@ define([
hideDuplicate: true
},
general: {
allowUserFeedback: true // XXX corner popup in settings?
allowUserFeedback: true
}
};
+6
View File
@@ -42,6 +42,12 @@
.cp-app-contacts-container {
height: 100%;
}
.cp-app-contacts-input {
textarea {
border: 0px;
color: white;
}
}
}
& > .cp-team-drive {
display: flex;