Merge branch 'timeslider' of git://github.com/Pita/etherpad-lite into timeslider

Browse source

...

This commit is contained in:

Peter 'Pita' Martischka 2011-06-21 15:11:44 +01:00

parent 27ae8bb3fa add35f16fd

commit 247462e2f8

3 changed files with 11 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

static/timeslider.html

View file

File diff suppressed because one or more lines are too long