Merge branch 'master' into 0000-workbench-user-profile-wording-changes
authorWard Vandewege <ward@curoverse.com>
Tue, 13 Jan 2015 21:42:51 +0000 (16:42 -0500)
committerWard Vandewege <ward@curoverse.com>
Tue, 13 Jan 2015 21:42:51 +0000 (16:42 -0500)
commit351a497c96770f379acdfe58ebeff34262e1308b
tree4002673d5eda2a34ece74ef020bef6af34632c82
parent74eaca91f86f352ddd4ea40ab49a4aaa484e9610
parentfa82df2ec3cab51eaaadd2a31b457d0e2ceafbcb
Merge branch 'master' into 0000-workbench-user-profile-wording-changes
apps/workbench/test/integration/user_profile_test.rb