Commit Graph

2 Commits

Author SHA1 Message Date
53aab228eb Merge remote-tracking branch 'remotes/origin/develop' into feature/test-merge-for-release
# Conflicts:
#	Web/Controls/Help/Tags/collaborative-editing/collaborative-editing.ascx
#	Web/Controls/Help/Tags/document-server/document-server.ascx
#	Web/Controls/Help/Tags/open-source-version/open-source-version.ascx
2022-04-05 14:09:39 +03:00
5d45e84491 Add Jira video, update video thumbnails 2022-03-24 18:27:51 +03:00