Lucas Zawacki 7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy		2014-11-14 15:33:17 -02:00
..
css/images	- move the html5 client out of labs	2014-01-06 08:44:15 -08:00
font	- move the html5 client out of labs	2014-01-06 08:44:15 -08:00
images	- move the html5 client out of labs	2014-01-06 08:44:15 -08:00
js	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests	2014-11-14 15:33:17 -02:00
templates	on logout the entire user row in the user list is removed	2014-06-03 14:40:35 +00:00
vendor	- move the html5 client out of labs	2014-01-06 08:44:15 -08:00
favicon.ico	- move the html5 client out of labs	2014-01-06 08:44:15 -08:00