990e786340
# 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
31 lines
669 B
Plaintext
31 lines
669 B
Plaintext
.DS_Store
|
|
._.DS_Store*
|
|
.metadata/
|
|
record-and-playback/playback-client-js/testmeeting/
|
|
record-and-playback/playback-web/playback-web-0.1.war
|
|
record-and-playback/.project
|
|
push_to_git.py
|
|
**/target/*
|
|
**/.cache-main
|
|
**/.cache-tests
|
|
.vagrant/*
|
|
**/.settings/*
|
|
*/.gradle
|
|
bbb-lti/.classpath
|
|
bbb-lti/.project
|
|
bbb-lti/bin
|
|
bbb-lti/lti-0.1.1.war
|
|
bbb-lti/make.sh
|
|
bbb-lti/deploy.sh
|
|
bbb-lti/target*
|
|
bbb-api-demo/bin*
|
|
bbb-api-demo/.classpath
|
|
bbb-api-demo/.project
|
|
bigbluebutton-web/.settings*
|
|
bigbluebutton-web/.classpath
|
|
bigbluebutton-web/.project
|
|
akka-bbb-apps/akka-bbb-apps*.log
|
|
bigbluebutton-html5/log/development.log
|
|
bigbluebutton-web/target-eclipse*
|
|
record-and-playback/.loadpath
|