Steven Miers fe9bd594b4 Merge feature/video_mvp to develop and resolve conflicts.		2014-11-03 18:25:33 -06:00
..
client	Merge	2014-11-01 10:43:33 -05:00
corp	VRFS-1399 format testimonial page	2014-03-10 19:35:48 -04:00
dialogs	Better lining up of checkbox labels.	2014-11-03 14:15:36 -06:00
landing	* implementing autostart, which also requires frontend control of audio	2014-08-28 21:11:25 -05:00
landings	* VRFS-2037 - landing pages done	2014-08-14 22:21:34 -05:00
minimal	* automatic reconnect dialog will guide user without having to click - VRFS-1404	2014-04-07 17:36:08 +01:00
users	Merge - incremental	2014-10-29 13:04:48 -05:00
web	Merge - incremental	2014-10-29 13:04:48 -05:00
application.css	merging jam-web into web	2013-09-15 18:04:37 +00:00
custom.css.scss	* fix import of common by custom	2014-02-27 19:22:58 +00:00
easydropdown_jk.css.scss	Merge - incremental	2014-10-29 13:04:48 -05:00
lato.css	merging jam-web into web	2013-09-15 18:04:37 +00:00
playbackControls.css.scss	* VRFS-946 and VRFS-922 - in-session recording features complete	2014-01-06 20:35:35 +00:00
screen_common.css.scss	merging jam-web into web	2013-09-15 18:04:37 +00:00
sessions.css.scss	merging jam-web into web	2013-09-15 18:04:37 +00:00
static_pages.css.scss	merging jam-web into web	2013-09-15 18:04:37 +00:00
users.css.scss	merging jam-web into web	2013-09-15 18:04:37 +00:00