Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki

This commit is contained in:
Peter 'Pita' Martischka 2011-12-11 18:09:51 +01:00
commit c72cd49ede
7 changed files with 378 additions and 6 deletions

View file

@ -1068,6 +1068,10 @@ position: relative;
background-position: 2px -49px;
}
#exportdokuwiki{
background-position: 2px -144px;
}
#export a{
text-decoration: none;
}
@ -1246,4 +1250,4 @@ label[for=readonlyinput] {
#sidediv {
display:none;
}
}
}