Hipster Hitman 3bb393bbc7 Merge branch 'master' of github.com:magnolia-fan/BeatHaven ... Conflicts: config/routes.rb		2011-04-28 03:24:41 +04:00
..
application_controller.rb	Mass move to root	2011-04-09 17:41:24 +04:00
artist_controller.rb	Tons of fixes	2011-04-21 03:05:32 +04:00
bot_controller.rb	Bot controller	2011-04-28 03:18:06 +04:00
errors_controller.rb	Routes error page, users controller	2011-04-13 05:59:45 +04:00
main_controller.rb	Tons of fixes	2011-04-21 03:05:32 +04:00
track_controller.rb	Tons of fixes	2011-04-21 03:05:32 +04:00
user_controller.rb	Invites beta	2011-04-16 12:31:47 +04:00