Steven Miers d684ecda3b Merge with latest from develop and manually fix.		2015-05-18 16:02:07 -05:00
..
_footer.html.erb	*hardcoding https where http is found	2015-05-15 18:25:47 -05:00
_header.html.erb	merging jam-web into web	2013-09-15 18:04:37 +00:00
_shim.html.erb	merging jam-web into web	2013-09-15 18:04:37 +00:00
_social_meta.html.erb	* VRFS-1083 - twitter mostly working; need to deal with edge cases	2014-02-07 14:07:08 +00:00
application.html.erb	VRFS-3242 : Merge with latest develop	2015-05-13 20:56:58 -05:00
client.html.erb	* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests	2015-05-15 12:34:35 -05:00
corporate.html.erb	* VRFS-3214 - adsense tracing code aded	2015-05-12 09:33:48 -05:00
landing.html.erb	VRFS-3242 : Merge with latest develop	2015-05-13 20:56:58 -05:00
minimal.html.erb	* VRFS-3214 - adsense tracing code aded	2015-05-12 09:33:48 -05:00
ping.jnlp.erb	* accidentally left out the security 'all-permissions' check	2013-12-18 18:09:36 +00:00
web.html.erb	Merge with latest from develop and manually fix.	2015-05-18 16:02:07 -05:00