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

Browse source

...

This commit is contained in:

Peter 'Pita' Martischka 2011-12-11 18:09:51 +01:00

parent 18ac89e374 40c5e70aa7

commit c72cd49ede

7 changed files with 378 additions and 6 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

BIN

static/img/fileicons.gif

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.6 KiB