aboutsummaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-08 23:59:43 -0500
committerSimon L'nu <simon.lnu@gmail.com>2012-03-08 23:59:43 -0500
commit20b2090182dc2a62adcbfb0ff844574e0596756d (patch)
treed4ab9e8726647014d886172c9421709701d77151 /images
parent8d19baadffaf38a563a3ad1052180bcb142eb564 (diff)
parente25fb2b2f9a822fa7180448ddff7f558dfc34fee (diff)
downloadvolse-hubzilla-20b2090182dc2a62adcbfb0ff844574e0596756d.tar.gz
volse-hubzilla-20b2090182dc2a62adcbfb0ff844574e0596756d.tar.bz2
volse-hubzilla-20b2090182dc2a62adcbfb0ff844574e0596756d.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: removed info add info fixed star-bug More improved transparency for smilies removed dolphin file (wtf?) . * master:
Diffstat (limited to 'images')
-rw-r--r--images/beer_mug.gifbin1032 -> 1021 bytes
-rwxr-xr-ximages/smiley-Oo.gifbin1045 -> 1003 bytes
-rwxr-xr-ximages/smiley-brokenheart.gifbin616 -> 598 bytes
3 files changed, 0 insertions, 0 deletions
diff --git a/images/beer_mug.gif b/images/beer_mug.gif
index a047d1987..9a3e05192 100644
--- a/images/beer_mug.gif
+++ b/images/beer_mug.gif
Binary files differ
diff --git a/images/smiley-Oo.gif b/images/smiley-Oo.gif
index a125d0ff2..a15d97427 100755
--- a/images/smiley-Oo.gif
+++ b/images/smiley-Oo.gif
Binary files differ
diff --git a/images/smiley-brokenheart.gif b/images/smiley-brokenheart.gif
index 79ca0c31b..971b57fd9 100755
--- a/images/smiley-brokenheart.gif
+++ b/images/smiley-brokenheart.gif
Binary files differ