bigbluebutton-Github/bigbluebutton-client/branding/default
Pedro Beschorner Marin b1ccea37a1 Merge branch 'auto-reconnect' into development
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
2015-07-23 18:44:21 +00:00
..
style/css Merge branch 'auto-reconnect' into development 2015-07-23 18:44:21 +00:00
build.xml changed the branding build directory from bin to client 2013-08-20 12:35:13 -07:00
README - add README 2012-12-27 21:46:06 +00:00

 This is the default BigBlueButton style.