diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-30 18:24:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 18:24:38 -0600 |
| commit | d817c0a958efda990af654f72d15d6f42b43dd49 (patch) | |
| tree | 0cff3632163fadeba3585f56ecdd8d1d919e12c7 /app/javascript/images | |
| parent | 65c87ca0ae20eb5dc62751047bda3e8b11e37ce0 (diff) | |
| parent | 4cca1d1e7efce51eecb64489f412a7b8631f0aed (diff) | |
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Diffstat (limited to 'app/javascript/images')
| -rw-r--r-- | app/javascript/images/mastodon-drawer.png | bin | 0 -> 32449 bytes |
| -rw-r--r-- | app/javascript/images/mastodon-getting-started.png | bin | 46174 -> 0 bytes |
| -rw-r--r-- | app/javascript/images/wave-drawer.png | bin | 0 -> 3269 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/images/mastodon-drawer.png b/app/javascript/images/mastodon-drawer.png new file mode 100644 index 000000000..a1fb642a0 --- /dev/null +++ b/app/javascript/images/mastodon-drawer.png Binary files differdiff --git a/app/javascript/images/mastodon-getting-started.png b/app/javascript/images/mastodon-getting-started.png deleted file mode 100644 index 8fe0df76a..000000000 --- a/app/javascript/images/mastodon-getting-started.png +++ /dev/null Binary files differdiff --git a/app/javascript/images/wave-drawer.png b/app/javascript/images/wave-drawer.png new file mode 100644 index 000000000..ca9f9e1d8 --- /dev/null +++ b/app/javascript/images/wave-drawer.png Binary files differ |
