Richard Alam bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 ... Conflicts: bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml		2014-04-08 19:07:37 +00:00
..
conf	Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5	2014-04-08 19:07:37 +00:00
controllers/org/bigbluebutton/web/controllers	Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5	2014-04-08 19:07:37 +00:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5	2014-04-08 15:55:04 +00:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00