Merge branch '8183-projects-dropdown' into 8286-fav-projects
authorradhika <radhika@curoverse.com>
Mon, 15 Feb 2016 17:35:02 +0000 (12:35 -0500)
committerradhika <radhika@curoverse.com>
Mon, 15 Feb 2016 17:35:02 +0000 (12:35 -0500)
commitb3bb4cdff0b10f42624b67ae19c03f1edfcecab0
tree236987f19d82ac6922b307a6d4707fbe0a42e746
parent3e515256d1ce0c7c09f4f8454f9761f261fb8b71
parent0728458bfd4236fbcfe42a59ccd58754de026bb4
Merge branch '8183-projects-dropdown' into 8286-fav-projects

Conflicts:
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/application/_projects_tree_menu.html.erb
apps/workbench/test/controllers/projects_controller_test.rb
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/application/_projects_tree_menu.html.erb
apps/workbench/test/controllers/projects_controller_test.rb