diff options
| author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
|---|---|---|
| committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
| commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
| tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /program/js/tinymce/plugins/emoticons/img/smiley-smile.gif | |
| parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
| parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'program/js/tinymce/plugins/emoticons/img/smiley-smile.gif')
| -rw-r--r-- | program/js/tinymce/plugins/emoticons/img/smiley-smile.gif | bin | 0 -> 344 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/program/js/tinymce/plugins/emoticons/img/smiley-smile.gif b/program/js/tinymce/plugins/emoticons/img/smiley-smile.gif Binary files differnew file mode 100644 index 000000000..fd27edfaa --- /dev/null +++ b/program/js/tinymce/plugins/emoticons/img/smiley-smile.gif |