Merge branch '2257-inequality-conditions' into 2290-user-activity
authorTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 15:12:16 +0000 (11:12 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 14 Mar 2014 15:12:16 +0000 (11:12 -0400)
commitcf7e30873ef4b92cc8ec099b2bb344391a070e93
treeca4270c5ac9578a85419de2c949f78c23d4b8aab
parent4127b85f2c1af611bb70d5ab469adac126d0a7a4
parent1dec6cc7093bcc565bed2baba17c8a892b7e2633
Merge branch '2257-inequality-conditions' into 2290-user-activity

Conflicts:
apps/workbench/app/controllers/users_controller.rb
apps/workbench/app/models/arvados_base.rb
apps/workbench/config/routes.rb
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/users_controller.rb
apps/workbench/app/helpers/application_helper.rb
apps/workbench/app/models/arvados_base.rb
apps/workbench/config/routes.rb