Robert Waltemath 1822b330d1 Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap ... Conflicts: Gemfile		2012-11-15 09:53:36 +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 remote-tracking branch 'upstream/rails3' into twitter-bootstrap	2012-11-15 09:53:36 +01:00
show.haml	Fixed messages. New styling for token input plugin.	2012-10-08 18:19:15 +02:00