resolve merge conflicts in translations

2016-12-26 14:25:02 +01:00
parent 5e1d8292c5 4476fd4006
commit f9da200381
4 changed files with 94 additions and 113 deletions
--- a/customize.dist/src/cryptpad.less
+++ b/customize.dist/src/cryptpad.less
@@ -218,7 +218,8 @@ p, pre, td, a, table, tr {
    border-radius: 5px;
    margin-top: 2 * 6px;
    margin-bottom: 2 * 6px;
-    white-space: nowrap;
+    display: inline-block;
+    line-height: 1.5em;
 }
 .alertify button {
    margin: 3px 0px;