BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9a7bae79a8
bigbluebutton-Github/bigbluebutton-client/resources
History
Felipe Cecagno 9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	record-and-playback/deploy.sh
2015-01-28 20:33:28 -02:00
..
dev - update join-mock.xml with new params 2010-07-15 10:30:36 -04:00
prod Merge branch '090-new-videodock' into HEAD 2015-01-28 20:33:28 -02:00
config.xml.template Merge branch '090-new-videodock' into HEAD 2015-01-28 20:33:28 -02:00
streams.xml - build BBB default style 2012-12-28 17:32:14 +00:00