Pedro Beschorner Marin 2c5ff4f7cd Merging with mconf old branch		2014-11-03 14:12:47 -02:00
..
conf	Merging with mconf old branch	2014-11-03 14:12:47 -02:00
controllers/org/bigbluebutton/web/controllers	Merging with mconf old branch	2014-11-03 14:12:47 -02:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	Merging with mconf old branch	2014-11-03 14:12:47 -02:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00