diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-06-10 22:25:36 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-06-11 00:08:41 +0200 |
| commit | 15929a3d597cc8f50091e602be5277ab00574286 (patch) | |
| tree | e009a465c83a984f0e69776ee3aa0d27401f6e98 /app/javascript/images/icons/icon_lock_open.svg | |
| parent | 970f06331bc7e482226e974c468b559a9e2f3fa3 (diff) | |
| parent | f09a66b9a741515532a1bfa0f2c3af08d9cc84b6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
Diffstat (limited to 'app/javascript/images/icons/icon_lock_open.svg')
| -rw-r--r-- | app/javascript/images/icons/icon_lock_open.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/images/icons/icon_lock_open.svg b/app/javascript/images/icons/icon_lock_open.svg new file mode 100644 index 000000000..12f559beb --- /dev/null +++ b/app/javascript/images/icons/icon_lock_open.svg @@ -0,0 +1 @@ +<svg fill="#fff" width="512" height="512" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm0 12H6V10h12v10z"/></svg> |