aboutsummaryrefslogtreecommitdiffstats
path: root/images/whitebeard.jpg
diff options
context:
space:
mode:
authorThomas <rat@rlyeh-military-affairs>2012-03-06 23:56:37 +0000
committerThomas <rat@rlyeh-military-affairs>2012-03-06 23:56:37 +0000
commitdadf80f64479792be85c7026fe1e3c5440066211 (patch)
tree9bb9f515c571d361b9e16f6ef6a308f4ffac5ed2 /images/whitebeard.jpg
parent22624917e03b0ea90de19b0808c5435aa04d3613 (diff)
parent05a52b2660a879a97d511b180e26fe12310d0464 (diff)
downloadvolse-hubzilla-dadf80f64479792be85c7026fe1e3c5440066211.tar.gz
volse-hubzilla-dadf80f64479792be85c7026fe1e3c5440066211.tar.bz2
volse-hubzilla-dadf80f64479792be85c7026fe1e3c5440066211.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: images/smiley-beard.png
Diffstat (limited to 'images/whitebeard.jpg')
-rw-r--r--images/whitebeard.jpgbin951 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg
deleted file mode 100644
index 363eba6a5..000000000
--- a/images/whitebeard.jpg
+++ /dev/null
Binary files differ