João Francisco Siebel 6f8a3fd9cd read settings from ini file		2018-09-18 13:12:16 -03:00
..
api	Merge remote-tracking branch 'upstream/master' into upload-token	2018-09-11 16:17:38 -03:00
startup	read settings from ini file	2018-09-18 13:12:16 -03:00
ui	Merge pull request #6061 from BobakOftadeh/Userlist-spacing	2018-09-13 15:25:06 -04:00
utils	Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5782-move-set-status	2018-08-01 15:43:31 +00:00