Merge branch 'master' of https://github.com/openHPI/codeocean

Browse Source

Conflicts:
	app/views/request_for_comments/index.html.slim

...

This commit is contained in:

Ralf Teusner

2015-09-04 14:07:06 +02:00

parent d292fec47c f229a85603

commit db90c9c61f

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

Diff Content Not Available