Carla Schroder d8dac11e71 Merge branch 'master' of https://github.com/owncloud/documentation ...

Conflicts:
	admin_manual/configuration/server_to_server_configuration.rst

2015-02-26 15:42:03 -08:00

..

big_file_upload_configuration.rst

Merge branch 'master' of https://github.com/owncloud/documentation

2015-02-26 15:42:03 -08:00

collaborative_documents_configuration.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

default_files_configuration.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

encryption_configuration.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

external_storage_configuration_gui.rst

Merge branch 'master' of https://github.com/owncloud/documentation

2015-02-26 15:42:03 -08:00

external_storage_configuration.rst

Merge branch 'master' of https://github.com/owncloud/documentation

2015-02-26 15:42:03 -08:00

federated_cloud_sharing_configuration.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

file_sharing_configuration.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

files_locking_enabling.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

index.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

previews_configuration.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00

serving_static_files_configuration.rst

Unified admin manual incorporatating both server & enterprise editions

2015-02-26 15:31:06 -08:00