Steven Miers d684ecda3b Merge with latest from develop and manually fix.		2015-05-18 16:02:07 -05:00
..
client	Merge with latest from develop and manually fix.	2015-05-18 16:02:07 -05:00
corp	* VRFS-3085 - update TOS	2015-04-24 10:08:43 -05:00
dialogs	Merge with latest develop	2015-05-11 17:25:37 -05:00
landing	* implementing autostart, which also requires frontend control of audio	2014-08-28 21:11:25 -05:00
landings	* VRFS-3236 - update landing pages for jamtracks	2015-05-15 15:02:00 -05:00
minimal	* automatic reconnect dialog will guide user without having to click - VRFS-1404	2014-04-07 17:36:08 +01:00
users	* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests	2015-05-15 12:34:35 -05:00
web	Merge with latest develop	2015-05-11 17:25:37 -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 and fix	2015-04-16 12:16:09 -05:00
lato.css	merging jam-web into web	2013-09-15 18:04:37 +00:00
playbackControls.css.scss	* VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates	2015-05-01 12:09:18 -05: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