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
..
images	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
javascripts	Fixed disabling submit_button in group order form.	2013-01-26 15:41:46 +01:00
stylesheets	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-06 01:01:12 +01:00