Richard Alam 0ddadd25eb Merge branch 'html5-bridge' of github.com:mohamed-ahmed/bigbluebutton into mohamed-ahmed-html5-bridge ... Conflicts: labs/bbb-html5-client/package.json		2013-09-27 17:48:15 +00:00
..
index.jade	First version of a single page html5 client app	2012-12-09 16:39:29 -02:00
layout.jade	Merge branch 'html5-bridge' of github.com:mohamed-ahmed/bigbluebutton into mohamed-ahmed-html5-bridge	2013-09-27 17:48:15 +00:00