BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c5917f6a92
bigbluebutton-Github/bigbluebutton-config
History
Pedro Beschorner Marin 17fc566975 Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0 
Conflicts:
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
	bigbluebutton-config/web/default.pdf
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2016-06-17 18:00:51 +00:00
..
bin Merge branch 'mconf' into bigbluebutton/bigbluebutton@master 2016-03-02 01:19:09 -03:00
cron.daily Fixes 332 2016-04-10 18:18:41 -04:00
record added chrome plugin patch for test recording 2010-11-19 05:04:16 +00:00
slides moving these configuration files into git 2010-09-18 23:24:04 +00:00
web Merge remote-tracking branch 'mconf/mconf' into bigbluebutton-v1.0.0 2016-06-17 18:00:51 +00:00
bigbluebutton-release Move from 1.0-RC to 1.0 2016-05-14 09:45:26 -04:00
check-localization-keys.txt remove and add strings for the localization file 2013-05-27 17:56:48 -05:00