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

..

environments

Adding rails part #2

2011-04-03 20:21:05 +04:00

initializers

Vk parser basic structure

2011-04-09 03:41:26 +04:00

locales

Adding rails part #2

2011-04-03 20:21:05 +04:00

application.rb

Rails BeatDB draft

2011-04-07 00:59:50 +04:00

boot.rb

Rails BeatDB draft

2011-04-07 00:59:50 +04:00

database.yml

Adding rails part #2

2011-04-03 20:21:05 +04:00

environment.rb

Adding rails part #2

2011-04-03 20:21:05 +04:00

mongoid.yml

MongoDB config & TrackData model

2011-04-07 06:50:02 +04:00

routes.rb

Merge branch 'master' of github.com:magnolia-fan/BeatHaven

2011-04-09 17:31:13 +04:00

vk_accounts.yml

Vk accounts YAML file fix

2011-04-09 03:13:28 +04:00