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
..
.gitkeep	Upgraded to rails 3.1.8. Fixed various bugs in wiki.	2012-09-30 21:15:55 +02:00
application.css	Removed fancybox. Fixed profile, my ordergroup and tasks.	2012-11-12 09:18:44 +01:00
bootstrap_and_overrides.css.less	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-06 01:01:12 +01:00
datepicker.less	Improved tasks.	2012-10-08 21:52:03 +02:00
ie_hacks.css	Upgraded to rails 3.1.8. Fixed various bugs in wiki.	2012-09-30 21:15:55 +02:00
main.sass	Added twitter bootstrap layout. Adapt home page.	2012-10-06 17:14:57 +02:00
print.scss	Upgraded to rails 3.1.8. Fixed various bugs in wiki.	2012-09-30 21:15:55 +02:00
token-input-bootstrappy.css	Fixed messages. New styling for token input plugin.	2012-10-08 18:19:15 +02:00