Merge branch 'LuisOlaya'
|
---|
.DS_Store |
---|
Not supported
|
api/ranking_trip.php |
---|
js/.DS_Store |
---|
Not supported
|
js/emoji/.DS_Store |
---|
Not supported
|
js/emoji/lib/css/emoji.css |
---|
js/emoji/lib/js/jquery.emojiarea.js |
---|
recursos/image20.png 0 → 100644 |
---|
|
views/auditorio.php |
---|
views/chat.php |
---|
views/juego.php |
---|
views/ranking_trip_reload.php |
---|