diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
| commit | 7174d1c955116e142754189e6169d9b31b599070 (patch) | |
| tree | 49139e81fc3cff355950401207968dca0944acd0 /app/javascript/images | |
| parent | 7347bc733418651216f22f224caf656471499a08 (diff) | |
| parent | 65f30f65a2816d5b25c096be0f237bbca17608e5 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/javascript/images')
| -rw-r--r-- | app/javascript/images/mastodon-drawer.png (renamed from app/javascript/images/mastodon-getting-started.png) | bin | 46174 -> 46174 bytes |
| -rw-r--r-- | app/javascript/images/wave-drawer.png | bin | 0 -> 3269 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/images/mastodon-getting-started.png b/app/javascript/images/mastodon-drawer.png index 8fe0df76a..8fe0df76a 100644 --- a/app/javascript/images/mastodon-getting-started.png +++ b/app/javascript/images/mastodon-drawer.png 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 |
