diff options
| author | Thomas <rat@rlyeh-military-affairs> | 2012-03-06 23:56:37 +0000 |
|---|---|---|
| committer | Thomas <rat@rlyeh-military-affairs> | 2012-03-06 23:56:37 +0000 |
| commit | dadf80f64479792be85c7026fe1e3c5440066211 (patch) | |
| tree | 9bb9f515c571d361b9e16f6ef6a308f4ffac5ed2 /images | |
| parent | 22624917e03b0ea90de19b0808c5435aa04d3613 (diff) | |
| parent | 05a52b2660a879a97d511b180e26fe12310d0464 (diff) | |
| download | volse-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')
| -rw-r--r-- | images/beard.jpg | bin | 989 -> 0 bytes |
| -rw-r--r-- | images/whitebeard.jpg | bin | 951 -> 0 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/images/beard.jpg b/images/beard.jpg Binary files differdeleted file mode 100644 index d65e0c33b..000000000 --- a/images/beard.jpg +++ /dev/null diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg Binary files differdeleted file mode 100644 index 363eba6a5..000000000 --- a/images/whitebeard.jpg +++ /dev/null |
