Michael Gapczynski 93556984f2 Merge branch 'master' into share_api ...

Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php

2012-07-25 17:08:18 -04:00

..

contacts.css

Merge branch 'master' into share_api

2012-07-25 17:08:18 -04:00

jquery.combobox.css

Added custom combobox widget.

2012-02-10 16:40:40 +01:00

jquery.Jcrop.css

Correction of path looking for apps and css

2012-06-22 20:58:52 +00:00