hristoterezov
|
8db602c8bd
|
Fixes make file
|
2015-01-09 11:49:45 +02:00 |
|
hristoterezov
|
6ce48a5b7b
|
Merge branch 'master' of github.com:jitsi/jitsi-meet
Conflicts:
app.js
index.html
libs/colibri/colibri.focus.js
libs/modules/statistics.bundle.js
moderator.js
modules/UI/videolayout/VideoLayout.js
muc.js
|
2015-01-07 17:14:10 +02:00 |
|
hristoterezov
|
69b0e2ad32
|
Creates UI module.
|
2015-01-07 16:54:03 +02:00 |
Damian Minkov
|
cd266f60d7
|
Fixes building deb packages.
|
2015-01-05 16:41:38 +02:00 |
|
hristoterezov
|
c6d8e34779
|
Implements statistics module.
|
2014-12-17 18:21:25 +02:00 |