Jorge Nunez 5b1d62f5d2 Merge remote branch 'upstream/master' into html5-bridge ... Conflicts: bigbluebutton-web/grails-app/conf/bigbluebutton.properties		2013-07-31 17:27:33 -07:00
..
conf	Merge remote branch 'upstream/master' into html5-bridge	2013-07-31 17:27:33 -07:00
controllers/org/bigbluebutton/web/controllers	Merge remote branch 'upstream/master' into html5-bridge	2013-07-31 17:27:33 -07:00
i18n	- bringing bigbluebutton-web into trunk	2009-04-01 16:53:45 +00:00
services/org/bigbluebutton/web/services	Merge almost complete. Still red dot not working	2013-01-25 21:50:32 -05:00
views	- bbb-scheduling has been removed from bbb-web	2010-07-19 19:27:24 +00:00