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

This commit is contained in:
ilya 2010-08-18 20:14:47 -07:00
commit 0d392a5e7e

View file

@ -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