wvengen cb3e2f7ca0 Merge branch 'master' into feature-receive ... Conflicts: config/locales/de.yml		2014-01-11 15:56:33 +01:00
..
environments	use i18n-js	2013-10-04 15:01:10 +02:00
initializers	Merge branch 'master' into updated-gems	2013-10-09 10:37:02 +02:00
locales	Merge branch 'master' into feature-receive	2014-01-11 15:56:33 +01:00
app_config.yml.SAMPLE	start of making nickname optional	2013-09-20 22:40:13 +02:00
application.rb	fix i18n deprecation warning	2013-12-06 16:13:04 +01:00
boot.rb	First step for upgrading to rails 3.	2011-05-11 01:32:21 +02:00
database.yml.MySQL_SAMPLE	adds a foodsoft:setup_development rake task	2013-05-26 14:02:16 +02:00
database.yml.SQLite_SAMPLE	adds a foodsoft:setup_development rake task	2013-05-26 14:02:16 +02:00
deploy.rb.SAMPLE	adds mailcatcher to foodsoft:setup_development	2013-05-29 12:35:16 +02:00
environment.rb	First step for upgrading to rails 3.	2011-05-11 01:32:21 +02:00
i18n-js.yml	receive helper and i18n cleanup	2014-01-09 13:01:10 +01:00
navigation.rb	move wiki functionality to plugin	2013-10-29 22:42:06 +01:00
routes.rb	Merge branch 'master' into feature-receive	2014-01-09 18:42:29 +01:00
schedule.rb	Fixed whenever cron config.	2013-09-18 14:52:23 +02:00