Merge branch 'LuisOlaya'
|
---|
.DS_Store |
---|
Not supported
|
emojiTest.html 0 → 100644 |
---|
index.php |
---|
js/emoji/.DS_Store 0 → 100644 |
---|
Not supported
|
js/emoji/.gitignore 0 → 100644 |
---|
js/emoji/LICENSE 0 → 100644 |
---|
js/emoji/README.md 0 → 100644 |
---|
js/emoji/demo/favicon.png 0 → 100644 |
---|
|
js/emoji/demo/index.html 0 → 100644 |
---|
js/emoji/lib/.DS_Store 0 → 100644 |
---|
Not supported
|
js/emoji/lib/css/emoji.css 0 → 100644 |
---|
js/emoji/lib/css/emoji.css.map 0 → 100644 |
---|
js/emoji/lib/img/IconsetSmiles.png 0 → 100644 |
---|
|
js/emoji/lib/img/IconsetSmiles_1x.png 0 → 100644 |
---|
|
js/emoji/lib/img/IconsetW.png 0 → 100644 |
---|
|
js/emoji/lib/img/IconsetW_1x.png 0 → 100644 |
---|
|
js/emoji/lib/img/blank.gif 0 → 100644 |
---|
|
js/emoji/lib/img/emoji_spritesheet_0.png 0 → 100644 |
---|
|
js/emoji/lib/img/emoji_spritesheet_1.png 0 → 100644 |
---|
|
js/emoji/lib/img/emoji_spritesheet_2.png 0 → 100644 |
---|
|
js/emoji/lib/img/emoji_spritesheet_3.png 0 → 100644 |
---|
|
js/emoji/lib/img/emoji_spritesheet_4.png 0 → 100644 |
---|
|
js/emoji/lib/js/config.js 0 → 100644 |
---|
js/emoji/lib/js/emoji-picker.coffee 0 → 100644 |
---|
js/emoji/lib/js/emoji-picker.js 0 → 100644 |
---|
js/emoji/lib/js/emoji-picker.js.map 0 → 100644 |
---|
js/emoji/lib/js/jquery.emojiarea.js 0 → 100644 |
---|
js/emoji/lib/js/util.js 0 → 100644 |
---|
js/emoji/package.json 0 → 100644 |
---|
js/emoji/screenshot.png 0 → 100644 |
---|
|
views/chat.php |
---|
views/equipos.php |
---|