bigbluebutton-Github/client/bbb-html5-client/public/js
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
..
collections Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server 2014-06-11 19:45:02 +00:00
lib bbb-lti: Updated css 2014-09-29 13:11:57 -04:00
models Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server 2014-06-11 19:45:02 +00:00
views Merge remote-tracking branch 'perroned/prototype-metor-client' into meteor-rebuild-server 2014-06-11 19:45:02 +00:00
app.coffee HTML5 client authentication using redis and the new messages 2014-04-24 17:39:59 -04:00
build.js - move the html5 client out of labs 2014-01-06 08:44:15 -08:00
main.js - move the html5 client out of labs 2014-01-06 08:44:15 -08:00
router.coffee when redirected from the login page, go straight into sessionView 2014-05-15 15:54:39 +00:00
utils.coffee - move the html5 client out of labs 2014-01-06 08:44:15 -08:00