Felipe Cecagno
|
334ed6db81
|
Merge branch 'master' into sharedNotes0.8
Conflicts:
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
bigbluebutton-client/build.xml
bigbluebutton-client/html-template/index.template.html
bigbluebutton-client/html-template/sharednotes/diff_match_patch_uncompressed.js
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
|
2012-02-17 14:04:31 -02:00 |
|