bigbluebutton-Github/bigbluebutton-client/branding
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
..
default Merge branch 'auto-reconnect' into development 2015-07-23 18:44:21 +00:00
README - add default skin/style 2012-12-27 20:27:29 +00:00

This is the directory where you should put your custom skinning/styling.