BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0deaadfd87
bigbluebutton-Github/bigbluebutton-html5/imports/ui
History
Anton Georgiev 0deaadfd87 Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/client/MainContainer.jsx
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/lib/bbb_api_bridge.js
	bigbluebutton-html5/client/whiteboard_models/whiteboard_paper.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
	bigbluebutton-html5/imports/ui/userlist/UserListService.js
	bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx
	bigbluebutton-html5/imports/ui/whiteboard/Slide.jsx
	bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx
	bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx
2016-05-04 22:04:08 +00:00
..
chat Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging 2016-05-04 22:04:08 +00:00
components Rename Actionsbar and Navbar to ActionsBar and NavBar 2016-05-04 11:48:53 -03:00
stylesheets/variables Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00
userlist Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging 2016-05-04 22:04:08 +00:00
whiteboard Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging 2016-05-04 22:04:08 +00:00