Merge branch 'master' into v7

NethServer · Jan 22, 2018 · 68100b3 · 68100b3
2 parents 1228bb8 + c2c5dfd
commit 68100b3
Show file tree

Hide file tree

Showing 32 changed files with 459 additions and 8 deletions.
diff --git a/administrator-manual/en/nscom/_static/webtop-2fa.png b/administrator-manual/en/nscom/_static/webtop-2fa.png
diff --git a/administrator-manual/en/nscom/_static/webtop-admin_panel_groups.png b/administrator-manual/en/nscom/_static/webtop-admin_panel_groups.png
diff --git a/administrator-manual/en/nscom/_static/webtop-admin_panel_nextcloud_auth_1.png b/administrator-manual/en/nscom/_static/webtop-admin_panel_nextcloud_auth_1.png
diff --git a/administrator-manual/en/nscom/_static/webtop-admin_panel_nextcloud_auth_2.png b/administrator-manual/en/nscom/_static/webtop-admin_panel_nextcloud_auth_2.png
diff --git a/administrator-manual/en/nscom/_static/webtop-admin_panel_nextcloud_auth_3.png b/administrator-manual/en/nscom/_static/webtop-admin_panel_nextcloud_auth_3.png
diff --git a/administrator-manual/en/nscom/_static/webtop-admin_panel_permission.png b/administrator-manual/en/nscom/_static/webtop-admin_panel_permission.png
diff --git a/administrator-manual/en/nscom/_static/webtop-button_desktop_notifications.png b/administrator-manual/en/nscom/_static/webtop-button_desktop_notifications.png
diff --git a/administrator-manual/en/nscom/_static/webtop-chrome_notifications.png b/administrator-manual/en/nscom/_static/webtop-chrome_notifications.png
diff --git a/administrator-manual/en/nscom/_static/webtop-desktop_notifications.png b/administrator-manual/en/nscom/_static/webtop-desktop_notifications.png
diff --git a/administrator-manual/en/nscom/_static/webtop-domain_mailcard.png b/administrator-manual/en/nscom/_static/webtop-domain_mailcard.png
diff --git a/administrator-manual/en/nscom/_static/webtop-dovecot_error.png b/administrator-manual/en/nscom/_static/webtop-dovecot_error.png
diff --git a/administrator-manual/en/nscom/_static/webtop-edit_mailcard.png b/administrator-manual/en/nscom/_static/webtop-edit_mailcard.png
diff --git a/administrator-manual/en/nscom/_static/webtop-edit_sync_google.png b/administrator-manual/en/nscom/_static/webtop-edit_sync_google.png
diff --git a/administrator-manual/en/nscom/_static/webtop-edit_sync_google2.png b/administrator-manual/en/nscom/_static/webtop-edit_sync_google2.png
diff --git a/administrator-manual/en/nscom/_static/webtop-export_calendar_csv.png b/administrator-manual/en/nscom/_static/webtop-export_calendar_csv.png
diff --git a/administrator-manual/en/nscom/_static/webtop-import_calendars1.png b/administrator-manual/en/nscom/_static/webtop-import_calendars1.png
diff --git a/administrator-manual/en/nscom/_static/webtop-import_calendars2.png b/administrator-manual/en/nscom/_static/webtop-import_calendars2.png
diff --git a/administrator-manual/en/nscom/_static/webtop-import_calendars3.png b/administrator-manual/en/nscom/_static/webtop-import_calendars3.png
diff --git a/administrator-manual/en/nscom/_static/webtop-import_contacts1.png b/administrator-manual/en/nscom/_static/webtop-import_contacts1.png
diff --git a/administrator-manual/en/nscom/_static/webtop-import_contacts2.png b/administrator-manual/en/nscom/_static/webtop-import_contacts2.png
diff --git a/administrator-manual/en/nscom/_static/webtop-import_contacts3.png b/administrator-manual/en/nscom/_static/webtop-import_contacts3.png
diff --git a/administrator-manual/en/nscom/_static/webtop-login_page.png b/administrator-manual/en/nscom/_static/webtop-login_page.png
diff --git a/administrator-manual/en/nscom/_static/webtop-multiple_sync.png b/administrator-manual/en/nscom/_static/webtop-multiple_sync.png
diff --git a/administrator-manual/en/nscom/_static/webtop-nextcloud_1.png b/administrator-manual/en/nscom/_static/webtop-nextcloud_1.png
diff --git a/administrator-manual/en/nscom/_static/webtop-nextcloud_2.png b/administrator-manual/en/nscom/_static/webtop-nextcloud_2.png
diff --git a/administrator-manual/en/nscom/_static/webtop-personal_information.png b/administrator-manual/en/nscom/_static/webtop-personal_information.png
diff --git a/administrator-manual/en/nscom/_static/webtop-preview.png b/administrator-manual/en/nscom/_static/webtop-preview.png
diff --git a/administrator-manual/en/nscom/_static/webtop-public_images.png b/administrator-manual/en/nscom/_static/webtop-public_images.png
diff --git a/administrator-manual/en/nscom/_static/webtop-public_signature.png b/administrator-manual/en/nscom/_static/webtop-public_signature.png
diff --git a/administrator-manual/en/nscom/_static/webtop-remote_phonebook.png b/administrator-manual/en/nscom/_static/webtop-remote_phonebook.png
diff --git a/administrator-manual/en/nscom/_static/webtop-sync_google.png b/administrator-manual/en/nscom/_static/webtop-sync_google.png
diff --git a/administrator-manual/en/webtop5.rst b/administrator-manual/en/webtop5.rst