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

@ -26,7 +26,7 @@ Feature: Show statistics
And I should see "you have a total of 9 actions"
And I should see "2 of these are completed"
Then I should see "Totals"
And I should see "Actions"
And I should see "actions"
And I should see "Contexts"
And I should see "Projects"
And I should see "Tags"