diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:38:44 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:38:44 -0500 |
| commit | 415ca107fd61562dcec41fb336efdfde58d32c8b (patch) | |
| tree | 23860d3717823e3dd47304b8ee8ab2b741097f7d /images | |
| parent | a33ca0a7318cf727b5c605c381e4c6f20463ad3e (diff) | |
| parent | 496a0ce4d110e5a777861aff7cd4c82fe2308c89 (diff) | |
| download | volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.tar.gz volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.tar.bz2 volse-hubzilla-415ca107fd61562dcec41fb336efdfde58d32c8b.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix html reshares when editplain in use
* master:
Diffstat (limited to 'images')
| -rw-r--r-- | images/beard.jpg | bin | 989 -> 0 bytes |
| -rw-r--r-- | images/smiley-beard.png | bin | 0 -> 1021 bytes |
| -rw-r--r-- | images/smiley-whitebeard.png | bin | 0 -> 1060 bytes |
| -rw-r--r-- | images/whitebeard.jpg | bin | 951 -> 0 bytes |
4 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/smiley-beard.png b/images/smiley-beard.png Binary files differnew file mode 100644 index 000000000..14c81414f --- /dev/null +++ b/images/smiley-beard.png diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png Binary files differnew file mode 100644 index 000000000..2a1fccbb7 --- /dev/null +++ b/images/smiley-whitebeard.png 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 |
