foodsoft/app/views/stockit
wvengen 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
2013-03-06 01:01:12 +01:00
..
_destroy_fail.js.haml Improve (AJAX) deletion of StockArticles 2013-02-25 11:12:28 +01:00
_form.html.haml finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00
destroy.js.haml Improve (AJAX) deletion of StockArticles 2013-02-25 11:12:28 +01:00
edit.html.haml finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00
index.html.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-06 01:01:12 +01:00
new.html.haml finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00