1
0
Fork 0
Ultimate internet jukebox
Go to file
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
php revert test Lighthouse 2011-04-07 00:35:00 +04:00
rails Merge branch 'master' of github.com:magnolia-fan/BeatHaven 2011-04-09 17:31:13 +04:00