foodsoft/app
Manuel Wiedenmann 7a63394dac Merge remote-tracking branch 'origin/rails3'
Conflicts:
	Gemfile
	Gemfile.lock
2013-06-10 01:53:31 +02:00
..
assets Merge remote-tracking branch 'origin/rails3' 2013-06-10 01:53:31 +02:00
controllers Merge remote-tracking branch 'origin/rails3' 2013-06-10 01:53:31 +02:00
documents show header on fax PDF (closes bennibu#109) 2013-06-04 13:08:50 +02:00
helpers Merge remote-tracking branch 'origin/rails3' 2013-06-10 01:53:31 +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 Merge remote-tracking branch 'origin/rails3' 2013-06-10 01:53:31 +02:00
views add missing i18n text 2013-06-06 02:42:38 +02:00
workers Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00