Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password

This commit is contained in:
John McLear 2012-12-02 17:06:33 +00:00
commit c9a5e55654
33 changed files with 1194 additions and 253 deletions

View file

@ -113,7 +113,7 @@
background-position: -29px -22px;
right: 5px;
top: 20px;
width: 29px;
width: 30px;
}
#timeslider .star {
background-image: url(../../static/img/star.png);