merges master and fixes conflicts

2015-09-10 17:47:40 +02:00
parent 2d3015703d cb072848f3
commit 43bdfb940e
34 changed files with 262 additions and 58 deletions
--- a/db/migrate/20150910092713_add_letter_verification_tries_to_users.rb
+++ b/db/migrate/20150910092713_add_letter_verification_tries_to_users.rb
@@ -0,0 +1,5 @@
+class AddLetterVerificationTriesToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :letter_verification_tries, :integer, default: 0
+  end
+end