Anton Georgiev f2092114e0 Merge pull request #6061 from BobakOftadeh/Userlist-spacing ... Fixed locked user to have the same height as a default user		2018-09-13 15:25:06 -04:00
..
api	Merge remote-tracking branch 'upstream/master' into upload-token	2018-09-11 16:17:38 -03:00
startup	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0	2018-09-06 22:06:40 +00: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