danielvincent 385e1673ab Merge branch 'master' into getting-started ... Conflicts: app/controllers/users_controller.rb app/views/users/_account.haml app/views/users/_profile.haml		2010-10-26 16:50:57 -07:00
..
images	added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show	2010-10-23 22:21:51 -07:00
javascripts	a user can add a person to an aspect from getting_started#2	2010-10-26 13:04:47 -07:00
stylesheets	Merge branch 'master' into getting-started	2010-10-26 16:50:57 -07:00
404.html	more informative 400 and 500 pages	2010-09-13 15:24:15 -07:00
422.html	Activerecord this time\!	2010-06-11 10:40:49 -07:00
500.html	more informative 400 and 500 pages	2010-09-13 15:24:15 -07:00
favicon.ico	added favicon from pubsite	2010-06-29 22:14:39 -07:00
robots.txt	Activerecord this time\!	2010-06-11 10:40:49 -07:00