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
|
2018-01-19 15:22:10 -06:00 |
|
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
|
2018-01-19 15:25:27 +01:00 |
|
David Yip
|
fa768abf5c
|
More ../ -> ~.
|
2018-01-02 00:26:44 -06:00 |
|
Akihiko Odaki
|
2c1ed5f872
|
Show mastodon on modal (#6129)
|
2018-01-02 05:07:56 +01:00 |