Upstream merge conflicts resolved

This commit is contained in:
terribl 2013-05-12 09:50:20 +03:00
commit cac715e40a
3 changed files with 35 additions and 5 deletions

View file

@ -42,3 +42,8 @@ body { height: 100%; margin: 0; padding: 0; }
cursor: pointer;
}
#tableinfo {
font-size: x-small;
font-family: monospace;
}