BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
85e68a66ca
bigbluebutton-Github/bigbluebutton-client/branding
History
Pedro Beschorner Marin 85e68a66ca Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/MessagePublisher.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
2016-06-27 19:57:48 +00:00
..
default Merge remote-tracking branch 'origin/inactivity-timeout' into merging-to-1.0 2016-06-27 19:57:48 +00:00
README - add default skin/style 2012-12-27 20:27:29 +00:00

README 

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