diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
| commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
| tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /app/javascript/images | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'app/javascript/images')
14 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/images/mailer/icon_cached.png b/app/javascript/images/mailer/icon_cached.png index e94abb7ba..73bf9d198 100644 --- a/app/javascript/images/mailer/icon_cached.png +++ b/app/javascript/images/mailer/icon_cached.png Binary files differdiff --git a/app/javascript/images/mailer/icon_done.png b/app/javascript/images/mailer/icon_done.png index 472364de4..bc669b7b6 100644 --- a/app/javascript/images/mailer/icon_done.png +++ b/app/javascript/images/mailer/icon_done.png Binary files differdiff --git a/app/javascript/images/mailer/icon_email.png b/app/javascript/images/mailer/icon_email.png index d8dfe161e..becbca2f9 100644 --- a/app/javascript/images/mailer/icon_email.png +++ b/app/javascript/images/mailer/icon_email.png Binary files differdiff --git a/app/javascript/images/mailer/icon_file_download.png b/app/javascript/images/mailer/icon_file_download.png index 24e424d3b..26ffddbdd 100644 --- a/app/javascript/images/mailer/icon_file_download.png +++ b/app/javascript/images/mailer/icon_file_download.png Binary files differdiff --git a/app/javascript/images/mailer/icon_flag.png b/app/javascript/images/mailer/icon_flag.png index 0f14f45a8..7e078fede 100644 --- a/app/javascript/images/mailer/icon_flag.png +++ b/app/javascript/images/mailer/icon_flag.png Binary files differdiff --git a/app/javascript/images/mailer/icon_grade.png b/app/javascript/images/mailer/icon_grade.png index 7f371ab11..94615fc4a 100644 --- a/app/javascript/images/mailer/icon_grade.png +++ b/app/javascript/images/mailer/icon_grade.png Binary files differdiff --git a/app/javascript/images/mailer/icon_lock_open.png b/app/javascript/images/mailer/icon_lock_open.png index d11c36475..5c1c36f95 100644 --- a/app/javascript/images/mailer/icon_lock_open.png +++ b/app/javascript/images/mailer/icon_lock_open.png Binary files differdiff --git a/app/javascript/images/mailer/icon_person_add.png b/app/javascript/images/mailer/icon_person_add.png index 696eb7495..9fe966391 100644 --- a/app/javascript/images/mailer/icon_person_add.png +++ b/app/javascript/images/mailer/icon_person_add.png Binary files differdiff --git a/app/javascript/images/mailer/icon_reply.png b/app/javascript/images/mailer/icon_reply.png index 51d92f845..83ddc07e8 100644 --- a/app/javascript/images/mailer/icon_reply.png +++ b/app/javascript/images/mailer/icon_reply.png Binary files differdiff --git a/app/javascript/images/mailer/logo.png b/app/javascript/images/mailer/logo.png index 77d0ef849..784be9539 100644 --- a/app/javascript/images/mailer/logo.png +++ b/app/javascript/images/mailer/logo.png Binary files differdiff --git a/app/javascript/images/mailer/wordmark.png b/app/javascript/images/mailer/wordmark.png index defe50178..6772b3318 100644 --- a/app/javascript/images/mailer/wordmark.png +++ b/app/javascript/images/mailer/wordmark.png Binary files differdiff --git a/app/javascript/images/preview.png b/app/javascript/images/preview.png index 369bed4b6..3d3a17b23 100644 --- a/app/javascript/images/preview.png +++ b/app/javascript/images/preview.png Binary files differdiff --git a/app/javascript/images/reticle.png b/app/javascript/images/reticle.png index 41a5d1c3a..a724ac0bc 100644 --- a/app/javascript/images/reticle.png +++ b/app/javascript/images/reticle.png Binary files differdiff --git a/app/javascript/images/void.png b/app/javascript/images/void.png index d73066688..c2b803c13 100644 --- a/app/javascript/images/void.png +++ b/app/javascript/images/void.png Binary files differ |
