Merge branch 'master' of github.com:diaspora/diaspora

0d392a5e · ilya · 32434350 · 9ccdf7ec · 0d392a5e
--- a/Rakefile
+++ b/Rakefile
@@ -4,4 +4,4 @@
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
-Rails::Application.load_tasks
+Diaspora::Application.load_tasks