Commit Graph

4 Commits

Author SHA1 Message Date
benni 620ec946f1 Merge branch 'master' into master-rails3-merging
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
benni ce7f8dc698 update ruby version to current stable. 2012-11-24 13:44:50 +01:00
benni 5849473db4 Do not git ignore ruby version managers. Set ruby 1.9.3 2012-07-20 15:41:53 +02:00
benni 7cf0308adb Added rbenv version file to change ruby version. 2012-07-20 14:55:52 +02:00