BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
334ed6db81
bigbluebutton-Github/bigbluebutton-client/resources
History
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
..
dev - update join-mock.xml with new params 2010-07-15 10:30:36 -04:00
prod Merge branch 'master' into sharedNotes0.8 2012-02-17 14:04:31 -02:00
config.xml.template Merge branch 'master' into sharedNotes0.8 2012-02-17 14:04:31 -02:00