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/icon_person_add.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/icon_person_add.svg')
| -rw-r--r-- | app/javascript/images/icon_person_add.svg | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/javascript/images/icon_person_add.svg b/app/javascript/images/icon_person_add.svg deleted file mode 100644 index 068b8ae7c..000000000 --- a/app/javascript/images/icon_person_add.svg +++ /dev/null @@ -1,4 +0,0 @@ -<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"> - <path d="M0 0h24v24H0z" fill="none"/> - <path d="M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm-9-2V7H4v3H1v2h3v3h2v-3h3v-2H6zm9 4c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/> -</svg> \ No newline at end of file |
