bigbluebutton-Github/bigbluebutton-client/branding/default
Ghaz Triki 990e786340 Merge branch 'master' into breakout-rooms-porto-algre-2015
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-web/.classpath
#	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-02-28 21:34:33 +01:00
..
style/css Merge branch 'master' into breakout-rooms-porto-algre-2015 2016-02-28 21:34:33 +01: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.