Jonathan Kolyer e539157d76 Merge branch 'develop' into vrfs988		2014-01-12 02:53:11 -06:00
admin	* parameterizing email configs and trying to speed up build on server	2014-01-14 16:55:34 -06:00
db	Resolve conflicts	2014-01-14 21:24:45 +00:00
pb	* DownloadAvailable proto msg added to help poke client when downloads become available	2014-01-08 21:24:21 +00:00
ruby	Merge branch 'develop' into vrfs988	2014-01-12 02:53:11 -06:00
web	Merge branch 'develop' into vrfs988	2014-01-12 02:53:11 -06:00
websocket-gateway	* parameterizing email configs and trying to speed up build on server	2014-01-14 16:55:34 -06:00
.gitignore	VRFS-819 VRFS-76 band profile updates	2013-11-02 02:10:35 -04:00
runweb	* forcing a build of develop branch	2014-01-05 00:02:48 +00:00
update	Remove -l arg from bash script	2014-01-07 14:37:22 -06:00