Merge branch '4533-remote-reset' closes #4533
authorTom Clegg <tom@curoverse.com>
Mon, 1 Dec 2014 19:39:44 +0000 (14:39 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 1 Dec 2014 19:39:44 +0000 (14:39 -0500)
commited0067ee9964c70f646a5f4f72c1302cc19c007c
tree1e3ac39a13f690e1a35667ce9738ec0681187973
parent4b0934a2bb95509468fc4b6132177d47cc7988a8
parentaf3d57d7eeb458e598c9d3954942db7e1d28b780
Merge branch '4533-remote-reset' closes #4533

Conflicts:
apps/workbench/Gemfile.lock
apps/workbench/Gemfile
apps/workbench/Gemfile.lock
apps/workbench/test/test_helper.rb
services/api/app/models/database_seeds.rb