Jonathan Kolyer a8dbca3552 Merge branch 'develop' into musicians_page		2013-11-03 23:43:21 -06:00
admin	removing 'unf' in admin Gemfile in case it's breaking the build	2013-11-05 22:21:12 -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: added current_city method	2013-11-03 23:42:41 -06:00
web	Merge branch 'develop' into musicians_page	2013-11-03 23:43:21 -06: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