diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-02 00:11:41 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-02 00:11:41 -0600 |
| commit | 54148b9a4a044e2c3ac9bb5eed71edcc0d598907 (patch) | |
| tree | 09cc3cd0558f0152ff17b0c48acbf346b8006098 /app/javascript/images | |
| parent | fa9b7ece2e521fb4d6b91a95028614ae9b2a58a3 (diff) | |
| parent | 764f87695358c06a823a9c9541f2e8fb092de299 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/javascript/images')
| -rw-r--r-- | app/javascript/images/mastodon-ui.png (renamed from app/javascript/images/mastodon-drawer.png) | bin | 32449 -> 32449 bytes |
| -rw-r--r-- | app/javascript/images/wave-compose-standalone.png | bin | 0 -> 5921 bytes |
| -rw-r--r-- | app/javascript/images/wave-modal.png | bin | 0 -> 5200 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/images/mastodon-drawer.png b/app/javascript/images/mastodon-ui.png index a1fb642a0..a1fb642a0 100644 --- a/app/javascript/images/mastodon-drawer.png +++ b/app/javascript/images/mastodon-ui.png Binary files differdiff --git a/app/javascript/images/wave-compose-standalone.png b/app/javascript/images/wave-compose-standalone.png new file mode 100644 index 000000000..287ee639b --- /dev/null +++ b/app/javascript/images/wave-compose-standalone.png Binary files differdiff --git a/app/javascript/images/wave-modal.png b/app/javascript/images/wave-modal.png new file mode 100644 index 000000000..88818a6d7 --- /dev/null +++ b/app/javascript/images/wave-modal.png Binary files differ |
