Skip to content

Commit

Permalink
Merge branch 'dev' into release-2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed May 6, 2022
2 parents 2486c78 + afdc7ef commit 1fc0fb3
Show file tree
Hide file tree
Showing 85 changed files with 22,070 additions and 16,713 deletions.
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2062,6 +2062,9 @@ packages/tools/release-server.js.map
packages/tools/setupNewRelease.d.ts
packages/tools/setupNewRelease.js
packages/tools/setupNewRelease.js.map
packages/tools/spellcheck.d.ts
packages/tools/spellcheck.js
packages/tools/spellcheck.js.map
packages/tools/tagServerLatest.d.ts
packages/tools/tagServerLatest.js
packages/tools/tagServerLatest.js.map
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2052,6 +2052,9 @@ packages/tools/release-server.js.map
packages/tools/setupNewRelease.d.ts
packages/tools/setupNewRelease.js
packages/tools/setupNewRelease.js.map
packages/tools/spellcheck.d.ts
packages/tools/spellcheck.js
packages/tools/spellcheck.js.map
packages/tools/tagServerLatest.d.ts
packages/tools/tagServerLatest.js
packages/tools/tagServerLatest.js.map
Expand Down
Binary file added Assets/WebsiteAssets/images/e2ee/e2ee-setup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/WebsiteAssets/images/e2ee/e2ee-share.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/WebsiteAssets/images/e2ee/e2ee-sync.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 36 additions & 35 deletions README.md

Large diffs are not rendered by default.

Loading

0 comments on commit 1fc0fb3

Please sign in to comment.