Raphael ec9e180eab Merge branch 'master' into HEAD ... Conflicts: public/stylesheets/application.css		2010-10-07 13:58:06 -07:00
..
_new_photo.haml	Use improved whitespace:scrub_gratuitous_newlines	2010-09-26 12:52:39 -04:00
_photo.haml	photo partial now has labels	2010-09-28 13:05:58 -07:00
edit.html.haml	Merge branch 'master' into HEAD	2010-10-07 13:58:06 -07:00
new.html.haml	Use improved whitespace:scrub_gratuitous_newlines	2010-09-26 12:52:39 -04:00
show.html.haml	Merge branch 'master' into HEAD	2010-10-07 13:58:06 -07:00