Hipster Hitman 092ef8f389 Merge branch 'master' of github.com:magnolia-fan/BeatHaven ... Conflicts: rails/app/views/artist/view.rhtml rails/config/routes.rb rails/public/stylesheets/beathaven.css		2011-04-09 17:31:13 +04:00
..
images	Player boo hoo	2011-04-08 22:39:49 +04:00
javascripts	Player boo hoo	2011-04-08 22:39:49 +04:00
stylesheets	Merge branch 'master' of github.com:magnolia-fan/BeatHaven	2011-04-09 17:31:13 +04:00
404.html	Adding rails part #2	2011-04-03 20:21:05 +04:00
422.html	Adding rails part #2	2011-04-03 20:21:05 +04:00
500.html	Adding rails part #2	2011-04-03 20:21:05 +04:00
favicon.ico	Adding rails part #2	2011-04-03 20:21:05 +04:00
robots.txt	Adding rails part #2	2011-04-03 20:21:05 +04:00