nextcloud-server-mirror

mirror of https://github.com/nextcloud/server.git synced 2026-03-08 18:28:16 +01:00

Files

Florin Peter 80433fc4c4 Merge branch 'master' into file_encryption_util_is_error

Conflicts:
	apps/files_encryption/lib/util.php

2013-05-27 14:41:53 +02:00

2013-05-21 10:30:24 +02:00

2013-05-23 22:09:28 +02:00

2013-05-25 12:08:18 +02:00

2013-05-07 16:17:38 +02:00

2013-05-23 23:56:31 +02:00

2013-05-23 23:56:31 +02:00

2013-05-27 02:07:24 +02:00

2013-05-27 14:41:53 +02:00

2013-05-23 23:56:31 +02:00

added users for tests

2013-05-26 20:44:15 +02:00

settings-admin.php

2013-05-23 23:56:31 +02:00

settings-personal.php

2013-05-23 23:56:31 +02:00