luciash 1b761ea4bf Merge remote-tracking branch 'upstream/master' ... Conflicts resolved manually: css/videolayout_default.css		2016-06-15 00:34:48 +02:00
..
chat	make the chatArrow image reference relative, allows for better base href support	2016-05-27 10:45:38 -05:00
contactlist	Checks whether we need to modify document, before change - on display name change.	2016-04-09 12:04:01 -05:00
settings	JWT client support	2016-06-13 16:11:44 -05:00
SidePanelToggler.js	[FIX] do not use percents but pixels to make the right panel readable on small screens again	2016-04-07 11:52:59 +02:00