Oswaldo Acauan 8bd65c1a43 Merge remote-tracking branch 'upstream/master' into refactor-api-users ... * upstream/master: (47 commits) Updated with correct version Check for initial values in application.conf remove defaultMessage Remove wrong selector when upserting captions Localize other labels through the application localize labels for AudioSettings component localize label for AudioTest component hide option to reset status if there is no status (emojis) drop voice in main room when joining breakout room add defaultMessage for Public Chat localize Join/Leave Audio labels Remove console logs Fix ´get_all_meetings_request´ being published multiple times Clean captions when handling the history reply Fix presentation slide coordinates - when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds use localized Public Chat label finish locals for the audio modal Returning number of users that participated in each meeting in getRecordings call add comment for condition ...		2017-02-23 17:46:30 +00:00
..
main.js	Merge remote-tracking branch 'upstream/master' into refactor-api-users	2017-02-23 17:46:30 +00:00