wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen ... Conflicts: app/assets/javascripts/application.js		2014-02-10 16:03:08 +01:00
..
assets	allow to edit GroupOrderArticle result from orders screen	2014-02-10 16:03:08 +01:00
controllers	allow to edit GroupOrderArticle result from orders screen	2014-02-10 16:03:08 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	allow to edit GroupOrderArticle result from orders screen	2014-02-10 16:03:08 +01:00
inputs	allow to edit GroupOrderArticle result from orders screen	2014-02-10 16:03:08 +01:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	Merge pull request #256 from wvengen/feature-partial_shared_sync	2014-02-07 11:24:33 +01:00
views	allow to edit GroupOrderArticle result from orders screen	2014-02-10 16:03:08 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00