Jonathan Kolyer bb370a3bb0 Merge branch 'vrfs192'		2013-02-11 00:42:24 -06:00
..
assets	show default avatar if user does not have one	2013-02-10 18:17:18 -05:00
controllers	duplicate instrument per connection bug fix / more style fixes	2013-02-07 22:20:45 -05:00
helpers	fix tests	2012-12-21 22:32:24 -08:00
mailers	* initial web commit	2012-08-30 21:09:02 -05:00
responders	* forcing javascript to use websocket_gateway_uri from configuration. I think this may revert something else we did, but fixe.s the test	2013-01-04 08:25:12 -06:00
views	Merge branch 'vrfs192'	2013-02-11 00:42:24 -06:00