rebase to master to include i18n changes and fix merge conflicts

This commit is contained in:
Reinier Balt 2011-01-19 10:13:56 +01:00
parent 7a74025253
commit 97e8602ef9
13 changed files with 43 additions and 34 deletions

View file

@ -12,5 +12,4 @@ end
Then /^the multiple action form should not be visible$/ do
selenium.is_visible("todo_multi_add").should == false
end
end