Merge branch 'master' into 3140-project-content-tabs
authorradhika <radhika@curoverse.com>
Mon, 21 Jul 2014 19:02:25 +0000 (15:02 -0400)
committerradhika <radhika@curoverse.com>
Mon, 21 Jul 2014 19:02:25 +0000 (15:02 -0400)
commit949ed4898bc5af8eaf0fdd21c00f7242168cfe22
tree1128cf3aa4acb4dd78c7395ad313f85191fb1da2
parenta7824d56a519db6d729323ca56e653db7e895f3c
parent589d2b599714a5e3c239aa25029f1a0a4261f520
Merge branch 'master' into 3140-project-content-tabs

Conflicts:
apps/workbench/app/controllers/projects_controller.rb
apps/workbench/app/controllers/projects_controller.rb
apps/workbench/test/integration/projects_test.rb