Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks

Browse source

Conflicts:
	config/locales/de.yml

...

This commit is contained in:

Robert Waltemath 2013-06-12 10:00:11 +02:00

parent 981944b869 b7f71f5859

commit 46b07a6136

257 changed files with 5408 additions and 1931 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1880

config/locales/de.yml

View file

File diff suppressed because it is too large Load diff