bigbluebutton-Github/bigbluebutton-client/branding
Ghazi Triki 0385d05001 Merge branch 'master' into breakout-rooms-porto-algre-2015
# Conflicts:
#	akka-bbb-apps/build.sbt
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
#	akka-bbb-fsesl/build.sbt
#	bbb-common-message/build.sbt
#	bigbluebutton-apps/build.gradle
#	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2016-01-27 14:16:05 +01:00
..
default Merge branch 'master' into breakout-rooms-porto-algre-2015 2016-01-27 14:16:05 +01: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.