Merge git://github.com/themasch/etherpad-lite into develop

Browse source

...

This commit is contained in:

Peter 'Pita' Martischka 2011-08-26 19:06:45 +01:00

parent 839db813f6 419d2bbd93

commit d23984f028

3 changed files with 10 additions and 0 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/etherpad_lite_icons.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.7 KiB