haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
jiti-meet/modules/UI
History
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
..
audio_levels Creates UI module. 2015-01-07 16:54:03 +02:00
avatar Creates UI module. 2015-01-07 16:54:03 +02:00
etherpad Creates UI module. 2015-01-07 16:54:03 +02:00
prezi Creates UI module. 2015-01-07 16:54:03 +02:00
side_pannels Creates UI module. 2015-01-07 16:54:03 +02:00
toolbars Merge branch 'master' of github.com:jitsi/jitsi-meet 2015-01-07 17:14:10 +02:00
util Merge branch 'master' of github.com:jitsi/jitsi-meet 2015-01-07 17:14:10 +02:00
videolayout Merge branch 'master' of github.com:jitsi/jitsi-meet 2015-01-07 17:14:10 +02:00
welcome_page Creates UI module. 2015-01-07 16:54:03 +02:00
UI.js Merge branch 'master' of github.com:jitsi/jitsi-meet 2015-01-07 17:14:10 +02:00