Brian Smith 5370f8853b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop		2013-11-05 22:14:38 -05:00
admin	adding optional 'fog' dependency 'unf' to suppress warnings	2013-11-05 20:03:43 -06:00
db	merge conflict	2013-11-03 03:16:14 -06:00
pb	VRFS-758 join request notification logic	2013-10-16 03:23:43 -04:00
ruby	vrfs-774: fixed inconsistent test failures	2013-11-03 08:08:25 -06:00
web	Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop	2013-11-05 22:14:38 -05:00
websocket-gateway	merge conflict	2013-11-03 03:16:14 -06:00
.gitignore	VRFS-819 VRFS-76 band profile updates	2013-11-02 02:10:35 -04:00
runweb	* adding helper scripts	2013-09-25 15:34:53 +00:00
update	* forgot bundle update on ruby	2013-09-25 15:43:40 +00:00