foodsoft/app
wvengen 98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
..
assets Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
controllers Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
documents i18n simple_form move of fax pdf 2013-10-09 23:41:15 +02:00
helpers i18n simple_form move of foodcoop 2013-10-09 23:00:07 +02:00
inputs Improved tasks. 2012-10-08 21:52:03 +02:00
mailers also translate mail subjects 2013-05-07 13:28:14 +02:00
models more robustness 2013-10-10 17:50:10 +02:00
views Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
workers Merge remote-tracking branch 'fsmanuel/master' into master. 2013-07-18 18:48:49 +02:00