Fixes conflicts. Merge branch 'master' into ancestry

2015-09-03 16:37:28 +02:00
parent bf017a8557 86783db3c3
commit 358028c3e6
94 changed files with 1062 additions and 673 deletions
--- a/db/migrate/20150902191315_add_letter_verification_code_to_users.rb
+++ b/db/migrate/20150902191315_add_letter_verification_code_to_users.rb
@@ -0,0 +1,5 @@
+class AddLetterVerificationCodeToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :letter_verification_code, :string
+  end
+end