Thomas Tanghus 675a56c5ed Merge branch 'master' of github.com:owncloud/core into vcategories_db ... Conflicts: lib/vcategories.php		2012-10-24 21:55:25 +02:00
..
vcategories	app !== type	2012-10-19 02:24:57 +02:00
appconfig.php	adding space between) and {	2012-09-07 15:22:01 +02:00
requesttoken.php	More Checkstyle cleanup	2012-10-23 08:01:09 +02:00
share.php	Fix autocomplete search for users for groups only share policy	2012-10-09 08:35:07 -04:00
translations.php	Respect coding style	2012-09-04 13:17:14 +03:00