Merge remote-tracking branch 'upstream/master'
[friendica-addons.git/.git] / smiley_pack /
drwxr-xr-x   ..
drwxr-xr-x - icons
-rw-r--r-- 15622 smiley_pack.php
-rw-r--r-- 15294 smiley_pack.php~