Ghazi Triki 66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 ... # Conflicts: # bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml # bigbluebutton-config/bigbluebutton-release # bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)		2018-07-16 16:08:38 +01:00
..
.meteor	Change cursor and annotation to user streams and add optimistic updates	2018-05-28 14:46:14 -03:00
client	Merge pull request #5854 from prlanzarin/video-attach-response-fixes	2018-07-11 13:41:09 -04:00
imports	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0	2018-07-16 16:08:38 +01:00
private	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0	2018-07-16 16:08:38 +01:00
public	Font files updated.	2018-07-05 11:36:34 -07:00
server	Implement basic GroupChat messages. Closes #4987	2018-03-09 15:42:14 -03:00
tests/webdriverio	Improved the naming of the test cases / screenshot files.	2018-01-22 18:32:29 -05:00
.babelrc	Integrated babel-plugin-react-remove-properties for Selenium tests	2017-11-04 00:38:44 -07:00
.eslintignore
.eslintrc.js	Add missing packages and fix formating	2017-06-05 13:26:47 +00:00
.gitignore
package-lock.json	Merge branch 'v2.0.x-release' into disable-mobile-screenshare	2018-06-29 11:01:28 -04:00
package.json	Merge branch 'v2.0.x-release' into disable-mobile-screenshare	2018-06-29 11:01:28 -04:00
transifex.sh	do not pull the source file en.json	2018-01-25 11:41:25 -05:00