Jonathan Kolyer 742402dfa2 vrfs-884: merge conflict fixes		2013-12-16 12:47:59 -06:00
admin	* fix for VRFS-885	2013-12-05 11:24:30 +00:00
db	vrfs-884: merge conflict	2013-12-16 12:36:41 -06:00
pb	VRFS-866 band invitations / notifications	2013-11-26 02:47:56 -05:00
ruby	vrfs-884: merge conflict fixes	2013-12-16 12:47:59 -06:00
web	vrfs-884: merge conflict	2013-12-16 12:36:41 -06:00
websocket-gateway	* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)	2013-11-16 14:05:23 +00: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