Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge

29 files changed, 0 insertions, 0 deletions

diff --git a/images/beer_mug.gif b/images/emoticons/beer_mug.gif
index 9a3e05192..9a3e05192 100644
--- a/images/beer_mug.gif
+++ b/images/emoticons/beer_mug.gif
diff --git a/images/coffee.gif b/images/emoticons/coffee.gif
index 7e2037174..7e2037174 100644
--- a/images/coffee.gif
+++ b/images/emoticons/coffee.gif
diff --git a/images/dislike.gif b/images/emoticons/dislike.gif
index 77779423c..77779423c 100644
--- a/images/dislike.gif
+++ b/images/emoticons/dislike.gif
diff --git a/images/like.gif b/images/emoticons/like.gif
index f71d0324d..f71d0324d 100644
--- a/images/like.gif
+++ b/images/emoticons/like.gif
diff --git a/images/smiley-Oo.gif b/images/emoticons/smiley-Oo.gif
index a15d97427..a15d97427 100644
--- a/images/smiley-Oo.gif
+++ b/images/emoticons/smiley-Oo.gif
diff --git a/images/smiley-bangheaddesk.gif b/images/emoticons/smiley-bangheaddesk.gif
index 91ccb8bb4..91ccb8bb4 100644
--- a/images/smiley-bangheaddesk.gif
+++ b/images/emoticons/smiley-bangheaddesk.gif
diff --git a/images/smiley-beard.png b/images/emoticons/smiley-beard.png
index 5d4b28463..5d4b28463 100644
--- a/images/smiley-beard.png
+++ b/images/emoticons/smiley-beard.png
diff --git a/images/smiley-brokenheart.gif b/images/emoticons/smiley-brokenheart.gif
index 971b57fd9..971b57fd9 100644
--- a/images/smiley-brokenheart.gif
+++ b/images/emoticons/smiley-brokenheart.gif
diff --git a/images/smiley-cool.gif b/images/emoticons/smiley-cool.gif
index cee1c1aa3..cee1c1aa3 100644
--- a/images/smiley-cool.gif
+++ b/images/emoticons/smiley-cool.gif
diff --git a/images/smiley-cry.gif b/images/emoticons/smiley-cry.gif
index 06e6ca2c2..06e6ca2c2 100644
--- a/images/smiley-cry.gif
+++ b/images/emoticons/smiley-cry.gif
diff --git a/images/smiley-embarassed.gif b/images/emoticons/smiley-embarassed.gif
index adc12e7c5..adc12e7c5 100644
--- a/images/smiley-embarassed.gif
+++ b/images/emoticons/smiley-embarassed.gif
diff --git a/images/smiley-facepalm.gif b/images/emoticons/smiley-facepalm.gif
index 724370369..724370369 100644
--- a/images/smiley-facepalm.gif
+++ b/images/emoticons/smiley-facepalm.gif
diff --git a/images/smiley-foot-in-mouth.gif b/images/emoticons/smiley-foot-in-mouth.gif
index b444e5781..b444e5781 100644
--- a/images/smiley-foot-in-mouth.gif
+++ b/images/emoticons/smiley-foot-in-mouth.gif
diff --git a/images/smiley-frown.gif b/images/emoticons/smiley-frown.gif
index 9ff19850d..9ff19850d 100644
--- a/images/smiley-frown.gif
+++ b/images/emoticons/smiley-frown.gif
diff --git a/images/smiley-heart.gif b/images/emoticons/smiley-heart.gif
index 6a11e7065..6a11e7065 100644
--- a/images/smiley-heart.gif
+++ b/images/emoticons/smiley-heart.gif
diff --git a/images/smiley-innocent.gif b/images/emoticons/smiley-innocent.gif
index 9d747140e..9d747140e 100644
--- a/images/smiley-innocent.gif
+++ b/images/emoticons/smiley-innocent.gif
diff --git a/images/smiley-kiss.gif b/images/emoticons/smiley-kiss.gif
index cc356611e..cc356611e 100644
--- a/images/smiley-kiss.gif
+++ b/images/emoticons/smiley-kiss.gif
diff --git a/images/smiley-laughing.gif b/images/emoticons/smiley-laughing.gif
index 1bf29de79..1bf29de79 100644
--- a/images/smiley-laughing.gif
+++ b/images/emoticons/smiley-laughing.gif
diff --git a/images/smiley-money-mouth.gif b/images/emoticons/smiley-money-mouth.gif
index 1e8ccd0f3..1e8ccd0f3 100644
--- a/images/smiley-money-mouth.gif
+++ b/images/emoticons/smiley-money-mouth.gif
diff --git a/images/smiley-sealed.gif b/images/emoticons/smiley-sealed.gif
index 98186742d..98186742d 100644
--- a/images/smiley-sealed.gif
+++ b/images/emoticons/smiley-sealed.gif
diff --git a/images/smiley-shaka.gif b/images/emoticons/smiley-shaka.gif
index 336fe3bcd..336fe3bcd 100644
--- a/images/smiley-shaka.gif
+++ b/images/emoticons/smiley-shaka.gif
diff --git a/images/smiley-smile.gif b/images/emoticons/smiley-smile.gif
index b9bff40a4..b9bff40a4 100644
--- a/images/smiley-smile.gif
+++ b/images/emoticons/smiley-smile.gif
diff --git a/images/smiley-surprised.gif b/images/emoticons/smiley-surprised.gif
index b07465326..b07465326 100644
--- a/images/smiley-surprised.gif
+++ b/images/emoticons/smiley-surprised.gif
diff --git a/images/smiley-thumbsup.gif b/images/emoticons/smiley-thumbsup.gif
index 1bc6b124e..1bc6b124e 100644
--- a/images/smiley-thumbsup.gif
+++ b/images/emoticons/smiley-thumbsup.gif
diff --git a/images/smiley-tongue-out.gif b/images/emoticons/smiley-tongue-out.gif
index 48867dc26..48867dc26 100644
--- a/images/smiley-tongue-out.gif
+++ b/images/emoticons/smiley-tongue-out.gif
diff --git a/images/smiley-undecided.gif b/images/emoticons/smiley-undecided.gif
index 28029794f..28029794f 100644
--- a/images/smiley-undecided.gif
+++ b/images/emoticons/smiley-undecided.gif
diff --git a/images/smiley-whitebeard.png b/images/emoticons/smiley-whitebeard.png
index 2a1fccbb7..2a1fccbb7 100644
--- a/images/smiley-whitebeard.png
+++ b/images/emoticons/smiley-whitebeard.png
diff --git a/images/smiley-wink.gif b/images/emoticons/smiley-wink.gif
index e1cefb05c..e1cefb05c 100644
--- a/images/smiley-wink.gif
+++ b/images/emoticons/smiley-wink.gif
diff --git a/images/smiley-yell.gif b/images/emoticons/smiley-yell.gif
index 5296c8836..5296c8836 100644
--- a/images/smiley-yell.gif
+++ b/images/emoticons/smiley-yell.gif