wvengen c25d4d3f4f use ruby-units for unit parsing (closes foodcoops/foodsoft#200) ... Conflicts: Gemfile Gemfile.lock		2014-05-13 17:01:25 +02:00
..
assets	expanded data-ignore-onchange support	2014-05-13 17:01:24 +02:00
controllers	add fax csv	2014-05-13 17:01:25 +02:00
documents	migrate to Rails 4.0 (closes foodcoops#214)	2014-02-24 12:46:28 +01:00
helpers	allow 500 items per page	2014-05-13 17:01:24 +02:00
inputs	migrate to Rails 4.0 (closes foodcoops#214)	2014-02-24 12:46:28 +01:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	use ruby-units for unit parsing (closes foodcoops/foodsoft#200)	2014-05-13 17:01:25 +02:00
views	add fax csv	2014-05-13 17:01:25 +02:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00