Richard Alam 0be1db0cc9 - fix merge edit problem		2012-08-17 14:42:30 +00:00
..
conf	- fix merge edit problem	2012-08-17 14:42:30 +00:00
controllers/org/bigbluebutton/web/controllers	load textfile from the client	2012-07-17 16:39:32 -07:00
i18n	- bringing bigbluebutton-web into trunk	2009-04-01 16:53:45 +00:00
services/org/bigbluebutton/web/services	load textfile from the client	2012-07-17 16:39:32 -07:00
views	- bbb-scheduling has been removed from bbb-web	2010-07-19 19:27:24 +00:00