merging

2013-10-27 20:17:52 -04:00
parent b8c400b29d 203a7a244f
commit 6d1c0c7869
9 changed files with 34 additions and 3 deletions
@@ -0,0 +1 @@
+# Logfile created on 2013-10-24 00:32:47 -0500 by logger.rb/31641
@@ -0,0 +1 @@
+# Logfile created on 2013-10-24 00:32:37 -0500 by logger.rb/31641
@@ -0,0 +1,7 @@
+# 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.
+Railsgoat::Application.config.secret_token = '2f1d90a26236c3245d96f5606c201a780dc9ca687e5ed82b45e211bb5dc84c1870f61ca9e002dad5dd8a149c9792d8f07f31a9575065cca064bd6af44f8750e4'
				`@@ -0,0 +1 @@`
				`# Logfile created on 2013-10-24 00:32:47 -0500 by logger.rb/31641`
				`@@ -0,0 +1 @@`
				`# Logfile created on 2013-10-24 00:32:37 -0500 by logger.rb/31641`