4 Commits (dd0dafed0327c9eeb3f4c46282060992215dc16f)

Author	SHA1	Message	Date
David Yip	d45ebe26dc	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	5daf5f2c57	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	fa4960ea74	More ../ -> ~.	7 years ago
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129)	7 years ago