Felipe Cecagno 6d12e362bd Merge branch 'mconf-live0.6.3' of github.com:mconf/bigbluebutton into mconf-live0.6.3 ... Conflicts: bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java		2015-05-18 10:18:07 -03:00
..
src/main	Merge branch 'mconf-live0.6.3' of github.com:mconf/bigbluebutton into mconf-live0.6.3	2015-05-18 10:18:07 -03:00
.gitignore	cleanup	2014-09-04 15:02:35 -03:00
build.gradle	Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release	2015-05-17 19:25:26 -03:00
vm-build.sh	- change build using gradle	2011-06-13 12:25:18 -04:00