Anton Georgiev 4f25f2ced1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master		2014-09-02 21:08:03 +00:00
..
conf	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master	2014-09-02 17:54:14 +00:00
controllers/org/bigbluebutton/web/controllers	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master	2014-09-02 21:08:03 +00:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	cleaning up	2014-08-11 18:46:10 +00:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00