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
This commit is contained in:
Hipster Hitman
2011-04-09 17:31:13 +04:00
36 changed files with 743 additions and 18891 deletions
@@ -0,0 +1,4 @@
require 'test_helper'
class TrackHelperTest < ActionView::TestCase
end