Merge remote-tracking branch 'origin/master' into merge-upstream

Browse Source

Conflicts:
      app/javascript/styles/mastodon/components.scss

...

This commit is contained in:

David Yip

2018-01-17 18:37:09 -06:00

parent aa2bf07281 7badad7797

commit 201e82686f

38 changed files with 419 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

app/javascript/images/elephant-friend.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 24 KiB

1

app/javascript/images/elephant_ui_disappointed.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 11 KiB

1

app/javascript/images/elephant_ui_working.svg Normal file

File diff suppressed because one or more lines are too long

Side by Side After Width:  |  Height:  |  Size: 8.3 KiB

BIN

app/javascript/images/mastodon-not-found.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 19 KiB