jfederico 2f3bd5b3ce Reformatted files with conflicts		2016-01-28 13:58:05 -05:00
..
conf	- change how we process upload presentation. Before, an uploaded presentation consumes all of the	2016-01-21 17:24:13 +00:00
controllers/org/bigbluebutton/web/controllers	Reformatted files with conflicts	2016-01-28 13:58:05 -05:00
i18n	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00
services/org/bigbluebutton/web/services	- remove printlns to cleanup logs	2015-09-23 20:11:06 +00:00
views	- upgrade bigbluebutton-web to grails 2.3.6	2014-02-25 15:46:06 +00:00