Merge branch 'master' into 4025-move-project-button-label
authorradhika <radhika@curoverse.com>
Mon, 6 Oct 2014 14:18:12 +0000 (10:18 -0400)
committerradhika <radhika@curoverse.com>
Mon, 6 Oct 2014 14:18:12 +0000 (10:18 -0400)
commit4b3e5e50e262fc51a158c1aed1942b1ef176e2eb
tree5ef3e241aa0520abbc4b9791e8ea70069ef4e685
parent350f4d5a3ef163b37de2b83bd6fefd37f1a35b8b
parent136f77bed67bd349fb73053379dcb7bae6a16592
Merge branch 'master' into 4025-move-project-button-label

Conflicts:
apps/workbench/app/views/application/_title_and_buttons.html.erb
apps/workbench/app/views/application/_title_and_buttons.html.erb
apps/workbench/test/integration/projects_test.rb