wvengen 42d622d1b2 cleanup orders and add search ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less app/views/orders/_articles.html.haml app/views/orders/show.html.haml		2014-01-17 13:41:38 +01:00
..
assets	cleanup orders and add search	2014-01-17 13:41:38 +01:00
controllers	i18n update	2014-01-13 23:23:37 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	cleanup orders and add search	2014-01-17 13:41:38 +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	consider group_order_article without result not manually changed	2014-01-03 13:03:28 +01:00
views	cleanup orders and add search	2014-01-17 13:41:38 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00