diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
| commit | e4f8679eaeea062e1f9ca9f58703b51ff8162c35 (patch) | |
| tree | 13940a853f1278a3c4ef89dd3a0bbedfeaaf7140 /public | |
| parent | 1978f7265e1e83bda25413da26f53c53110af764 (diff) | |
| parent | 8485c436d5d083c28df8c942fe521bfb46edfc9f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.
Diffstat (limited to 'public')
| -rw-r--r-- | public/shortcuts/direct.png | bin | 0 -> 3045 bytes |
| -rw-r--r-- | public/shortcuts/new-status.png | bin | 0 -> 3031 bytes |
| -rw-r--r-- | public/shortcuts/notifications.png | bin | 0 -> 3067 bytes |
| -rw-r--r-- | public/shortcuts/profile.png | bin | 0 -> 4190 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/public/shortcuts/direct.png b/public/shortcuts/direct.png new file mode 100644 index 000000000..e8772c00e --- /dev/null +++ b/public/shortcuts/direct.png Binary files differdiff --git a/public/shortcuts/new-status.png b/public/shortcuts/new-status.png new file mode 100644 index 000000000..b7095f3c4 --- /dev/null +++ b/public/shortcuts/new-status.png Binary files differdiff --git a/public/shortcuts/notifications.png b/public/shortcuts/notifications.png new file mode 100644 index 000000000..6b9d45718 --- /dev/null +++ b/public/shortcuts/notifications.png Binary files differdiff --git a/public/shortcuts/profile.png b/public/shortcuts/profile.png new file mode 100644 index 000000000..0b3bf517d --- /dev/null +++ b/public/shortcuts/profile.png Binary files differ |
