wvengen 8db516c5f0 Merge branch 'master' into feature-cleaner_order_details ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less		2014-01-20 13:36:46 +01:00
..
assets	Merge branch 'master' into feature-cleaner_order_details	2014-01-20 13:36:46 +01:00
controllers	Merge branch 'master' into feature-cleaner_order_details	2014-01-20 13:36:46 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	allow to preselect order view	2014-01-17 15:04:03 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'	2014-01-20 12:12:00 +01:00
views	Merge branch 'master' into feature-cleaner_order_details	2014-01-20 13:36:46 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00