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

config/initializers/secret_token.rb

-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-Rails.application.config.secret_token = 'b1347247976a6c5fba55f3f81faba1c8b6777e556015824405f06b4dbcea65b433535f7ad747ce36'