4 Commits (3afc6174f5b9a06ee16857b8a51d863b568185d3)

Author	SHA1	Message	Date
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Eugen Rochko	540b3f37ae	Replace drawer elephant graphic with a vector image (#6286) ... * Replace drawer elephant graphic with a vector image * Replace wave graphic with SVG * Remove unused elephant graphic	7 years ago
David Yip	fa768abf5c	More ../ -> ~.	7 years ago
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	7 years ago