Merge branch 'master' into spreedmecollabora

27 files changed, 1 insertions, 0 deletions

diff --git a/2FA/2FA login.png b/2FA/2FA login.png
new file mode 100644
index 0000000..4713a1d
--- /dev/null
+++ b/2FA/2FA login.png
diff --git a/2FA/configure 2FA.png b/2FA/configure 2FA.png
new file mode 100644
index 0000000..909d0c1
--- /dev/null
+++ b/2FA/configure 2FA.png
diff --git a/README.md b/README.md
index 32eed45..a3c74d9 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
 # Screenshots
+We just keep the newest screenshots in master and create a release branch for each older release whenever we start adding screenshots of the new version. Simplicity FTW!
diff --git a/server/admin_settings/Password Policy.png b/admin_settings/Password Policy.png
index b6c3b6a..b6c3b6a 100644
--- a/server/admin_settings/Password Policy.png
+++ b/admin_settings/Password Policy.png
diff --git a/server/admin_settings/SAML.png b/admin_settings/SAML.png
index 8236b5a..8236b5a 100644
--- a/server/admin_settings/SAML.png
+++ b/admin_settings/SAML.png
diff --git a/admin_settings/Sharing admin.png b/admin_settings/Sharing admin.png
new file mode 100644
index 0000000..6efb1a9
--- /dev/null
+++ b/admin_settings/Sharing admin.png
diff --git a/server/admin_settings/Theming.png b/admin_settings/Theming.png
index c938321..c938321 100644
--- a/server/admin_settings/Theming.png
+++ b/admin_settings/Theming.png
diff --git a/server/admin_settings/Windows Network Drive and SMB.png b/admin_settings/Windows Network Drive and SMB.png
index b615f69..b615f69 100644
--- a/server/admin_settings/Windows Network Drive and SMB.png
+++ b/admin_settings/Windows Network Drive and SMB.png
diff --git a/admin_settings/app overview.png b/admin_settings/app overview.png
new file mode 100644
index 0000000..bb8c698
--- /dev/null
+++ b/admin_settings/app overview.png
diff --git a/server/admin_settings/app store - SAML.png b/admin_settings/app store - SAML.png
index 8b2d0a4..8b2d0a4 100644
--- a/server/admin_settings/app store - SAML.png
+++ b/admin_settings/app store - SAML.png
diff --git a/server/admin_settings/app store - auditing and logging.png b/admin_settings/app store - auditing and logging.png
index 3cf396b..3cf396b 100644
--- a/server/admin_settings/app store - auditing and logging.png
+++ b/admin_settings/app store - auditing and logging.png
diff --git a/server/admin_settings/app store - password policy.png b/admin_settings/app store - password policy.png
index 1d75b71..1d75b71 100644
--- a/server/admin_settings/app store - password policy.png
+++ b/admin_settings/app store - password policy.png
diff --git a/server/admin_settings/app store - theming.png b/admin_settings/app store - theming.png
index a20ea1f..a20ea1f 100644
--- a/server/admin_settings/app store - theming.png
+++ b/admin_settings/app store - theming.png
diff --git a/server/admin_settings/audit_log.png b/admin_settings/audit_log.png
index b836e0f..b836e0f 100644
--- a/server/admin_settings/audit_log.png
+++ b/admin_settings/audit_log.png
diff --git a/admin_settings/feedback app.png b/admin_settings/feedback app.png
new file mode 100644
index 0000000..59c0aeb
--- /dev/null
+++ b/admin_settings/feedback app.png
diff --git a/admin_settings/feedback.png b/admin_settings/feedback.png
new file mode 100644
index 0000000..b9e1885
--- /dev/null
+++ b/admin_settings/feedback.png
diff --git a/admin_settings/monitoring server info API.png b/admin_settings/monitoring server info API.png
new file mode 100644
index 0000000..c84eb94
--- /dev/null
+++ b/admin_settings/monitoring server info API.png
diff --git a/admin_settings/monitoring server info.png b/admin_settings/monitoring server info.png
new file mode 100644
index 0000000..ac87ebd
--- /dev/null
+++ b/admin_settings/monitoring server info.png
diff --git a/password_policy/password_policy_settings.png b/admin_settings/password_policy/password_policy_settings.png
index 219988f..219988f 100644
--- a/password_policy/password_policy_settings.png
+++ b/admin_settings/password_policy/password_policy_settings.png
diff --git a/admin_settings/security warnings.png b/admin_settings/security warnings.png
new file mode 100644
index 0000000..408dc76
--- /dev/null
+++ b/admin_settings/security warnings.png
diff --git a/admin_settings/sessions and app passwords.png b/admin_settings/sessions and app passwords.png
new file mode 100644
index 0000000..8d5269c
--- /dev/null
+++ b/admin_settings/sessions and app passwords.png
diff --git a/admin_settings/workflow/file-access-control.png b/admin_settings/workflow/file-access-control.png
new file mode 100644
index 0000000..75afcc3
--- /dev/null
+++ b/admin_settings/workflow/file-access-control.png
diff --git a/admin_settings/workflow/tagging-retention.png b/admin_settings/workflow/tagging-retention.png
new file mode 100644
index 0000000..0e2ee16
--- /dev/null
+++ b/admin_settings/workflow/tagging-retention.png
diff --git a/files/switch apps.png b/files/switch apps.png
new file mode 100644
index 0000000..85a2f26
--- /dev/null
+++ b/files/switch apps.png
diff --git a/files/txt file preview.png b/files/txt file preview.png
new file mode 100644
index 0000000..51cf399
--- /dev/null
+++ b/files/txt file preview.png
diff --git a/files/video player.png b/files/video player.png
new file mode 100644
index 0000000..325a9f4
--- /dev/null
+++ b/files/video player.png
diff --git a/files/welcome.png b/files/welcome.png
new file mode 100644
index 0000000..846053d
--- /dev/null
+++ b/files/welcome.png