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/main.css
+++ b/customize.dist/main.css
@@ -386,7 +386,8 @@ tr {
  border-radius: 5px;
  margin-top: 12px;
  margin-bottom: 12px;
-  white-space: nowrap;
+  display: inline-block;
+  line-height: 1.5em;
 }
 .alertify button {
  margin: 3px 0px;