wvengen c37ed74942 Merge branch 'master' into allow-no-nickname ... Conflicts: app/views/foodcoop/users/_users.html.haml		2013-10-29 19:15:52 +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 allow-no-nickname	2013-10-29 19:15:52 +01:00
app_config.yml.SAMPLE	start of making nickname optional	2013-09-20 22:40:13 +02:00
application.rb	i18n-js assets configuration change	2013-10-23 12:57:42 +02: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	use i18n-js	2013-10-04 15:01:10 +02:00
navigation.rb	finish navigation i18n	2013-02-22 00:37:17 +01:00
routes.rb	Move StockArticle#history to StockArticle#show	2013-10-03 22:24:21 +02:00
schedule.rb	Fixed whenever cron config.	2013-09-18 14:52:23 +02:00