wvengen b30b424540 Merge branch 'master' into feature-receive ... Conflicts: app/helpers/finance/order_articles_helper.rb		2014-01-09 18:42:29 +01:00
..
_edit.html.haml	Merge branch 'master' into feature-receive	2014-01-09 18:42:29 +01:00
_new.html.haml	Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b	2014-01-02 19:17:41 +01:00
create.js.erb	Apply publish/subscribe for OrderArticle#create	2014-01-02 19:16:03 +01:00
destroy.js.haml	Free order_article resource from finance namespace; also unlock for role_orders	2014-01-02 19:14:41 +01:00
edit.js.haml	Free order_article resource from finance namespace; also unlock for role_orders	2014-01-02 19:14:41 +01:00
new.js.haml	Free order_article resource from finance namespace; also unlock for role_orders	2014-01-02 19:14:41 +01:00
update.js.erb	Free order_article resource from finance namespace; also unlock for role_orders	2014-01-02 19:14:41 +01:00