about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-04 14:51:42 +0200
committerGitHub <noreply@github.com>2017-04-04 14:51:42 +0200
commit48dfdad49255ae4a100e01f41852e65806858fce (patch)
treea2bfe7a94bcd7a37399470b31c0453e1b489dea9 /app/assets
parent5b6f4fdeb4932df1704da01762cc22c63aacb20f (diff)
parented4a723a82e90fc057494e4fdec4a2074a3164c7 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/images/fluffy-elephant-friend.pngbin1101408 -> 60667 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/images/fluffy-elephant-friend.png b/app/assets/images/fluffy-elephant-friend.png
index 11787e936..f0df29927 100644
--- a/app/assets/images/fluffy-elephant-friend.png
+++ b/app/assets/images/fluffy-elephant-friend.png
Binary files differ