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
..
tasks	Merge branch 'master' into master-rails3-merging	2012-12-11 10:32:59 +01:00
templates/haml/scaffold	Upgraded to rails 3.1.8. Fixed various bugs in wiki.	2012-09-30 21:15:55 +02:00
apple_bar.rb	Added twitter bootstrap layout. Adapt home page.	2012-10-06 17:14:57 +02:00
foodsoft_config.rb	Added rake task to execute every rake task for every foodcoop.	2012-08-27 08:24:25 +02:00
foodsoft_file.rb	Fixed articles module.	2012-10-28 18:03:50 +01:00
order_pdf.rb	Refactored pdf generation with newest prawn.	2012-10-02 02:50:48 +02:00
wikilink.rb	Upgraded to rails 3.1.8. Fixed various bugs in wiki.	2012-09-30 21:15:55 +02:00