Dale Karp 7f03043f78 updated local props file		2013-03-07 17:59:36 +00:00
..
conf	updated local props file	2013-03-07 17:59:36 +00:00
controllers/org/bigbluebutton/web/controllers	Merge almost complete. Still red dot not working	2013-01-25 21:50:32 -05: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