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

..

app.php

Merge branch 'master' into share_api

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

database.xml

Change uri fields from 100 to 200 chars.

2012-07-20 15:15:18 +02:00

info.xml

mark the apps as part of the shipped package and increase the requirement to ownCloud 4

2012-05-18 16:06:57 +02:00

migrate.php

Code style.

2012-07-20 17:11:13 +02:00

remote.php

Code style.

2012-07-20 17:11:13 +02:00

update.php

Wrong version comparison in update.php.

2012-07-17 03:59:41 +02:00

version

Change uri fields from 100 to 200 chars.

2012-07-20 15:15:18 +02:00