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

Conflicts: config/locales/de.yml
2013-06-12 10:00:11 +02:00 · 2013-06-12 10:00:11 +02:00 · 46b07a6136
commit 46b07a6136
parent 981944b869 b7f71f5859
257 changed files with 5408 additions and 1931 deletions
--- a/lib/tasks/foodsoft.rake
+++ b/lib/tasks/foodsoft.rake
@ -1,6 +1,5 @@
 # put in here all foodsoft tasks
 # => :environment loads the environment an gives easy access to the application
-
 namespace :foodsoft do
  desc "Notify users of upcoming tasks"
  task :notify_upcoming_tasks => :environment do