Felipe Cecagno 12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 ... Conflicts: bigbluebutton-client/locale/fr_CA/bbbResources.properties bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml		2014-12-09 16:52:43 -02:00
..
conf	Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1	2014-12-09 16:52:43 -02:00
controllers/org/bigbluebutton/web/controllers	Merge branch '090-download-presentation' into mconf-live0.6.1	2014-11-23 23:02:22 -02:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	More cleanup	2014-11-03 16:09:18 -02:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00