Merge branch 'master' of /home/jose/etherpad-lite/

Browse source

...

This commit is contained in:

Peter 'Pita' Martischka 2011-08-20 18:23:58 +01:00

parent c365bc9522 9d37d91ce1

commit 42662d73d0

10 changed files with 602 additions and 51 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/colorpicker.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.9 KiB