benni 7c9d666909 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 ... Conflicts: Gemfile		2012-11-24 15:27:48 +01:00
..
_messages.html.haml	Improved tasks.	2012-10-08 21:52:03 +02:00
index.html.haml	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
new.haml	Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3	2012-11-24 15:27:48 +01:00
show.haml	Fixed messages. New styling for token input plugin.	2012-10-08 18:19:15 +02:00