Robert Waltemath 1822b330d1 Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap ... Conflicts: Gemfile		2012-11-15 09:53:36 +01:00
..
assets	Removed fancybox. Fixed profile, my ordergroup and tasks.	2012-11-12 09:18:44 +01:00
controllers	Removed fancybox. Fixed profile, my ordergroup and tasks.	2012-11-12 09:18:44 +01:00
documents	Refactored pdf generation with newest prawn.	2012-10-02 02:50:48 +02:00
helpers	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	Fixed feedback.	2012-11-10 17:05:43 +01:00
models	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
views	Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap	2012-11-15 09:53:36 +01:00