Jonata Teixeira Pastro f931d6cf76 Merging branches feat1212 and new-videodock.		2014-05-28 21:02:23 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles	2014-03-12 21:58:15 -03:00
config.xml.template	Merging branches feat1212 and new-videodock.	2014-05-28 21:02:23 +00:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00