Merge commit '1cdb9e8501' into rails3-multiple-recurring-tasks

Conflicts:
	Gemfile
	db/schema.rb
This commit is contained in:
Robert Waltemath 2013-03-15 17:59:19 +01:00
commit 981944b869
7 changed files with 75 additions and 3 deletions

View file

@ -324,6 +324,7 @@ de:
required_users: 'Anzahl'
due_date: 'Wann erledigen?'
workgroup: 'Arbeitsgruppe'
periodic: 'Wöchentlich wiederholen'
done: Erledigt?
message:
sent_to_all: 'An alle Mitglieder schicken'