Merge branch 'johnyma22'

Browse source

Conflicts:
	node/utils/Minify.js
	src/static/js/pad.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_savedrevs.js
	static/css/timeslider.css
	static/pad.html

...

This commit is contained in:

Egil Moeller 2012-04-01 13:27:38 +02:00

parent b74447aa3c aaad7d1428

commit 33c53e61c2

13 changed files with 179 additions and 552 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

src/static/img/etherpad_lite_icons.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 8.1 KiB