Michael Gapczynski 839b873656 Merge branch 'master' into share_api ...

Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php

2012-08-14 10:22:13 -04:00

..

app.php

Merge branch 'master' into share_api

2012-08-06 13:49:54 -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

Following the code guidelines makes Michael happy :-)

2012-08-10 22:20:32 +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