diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-17 18:37:09 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-01-17 18:37:09 -0600 |
commit | 201e82686f86d06e10afb62184a091417b09d5ad (patch) | |
tree | 419565a2dae93e2fa5bd06726265ff1c457dbaa1 /app/javascript/images/elephant-friend.png | |
parent | aa2bf07281ba1e41c9e32a760684c15081524a7c (diff) | |
parent | 7badad7797b487b411a2ab34e0f7413741974bb4 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'app/javascript/images/elephant-friend.png')
-rw-r--r-- | app/javascript/images/elephant-friend.png | bin | 24466 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/app/javascript/images/elephant-friend.png b/app/javascript/images/elephant-friend.png
deleted file mode 100644
index 3c5145ba9..000000000
--- a/app/javascript/images/elephant-friend.png
+++ /dev/null
Binary files differ |