Merge 33266915be into 18f90866ae

Browse source

...

This commit is contained in:

GitHub Merge Button 2011-12-04 13:02:20 -08:00

parent 18f90866ae 33266915be

commit 8551b02e2b

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