Merge branch 'master' into features/publicity

# Conflicts: # .gitignore
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
@@ -44,7 +44,6 @@ class Supporter
  field :coordinates,   type: Array
  field :comments,      type: String
  field :language,      type: String
-  field :unsubscribed,  type: Boolean, default: false
  field :duplicate,     type: Boolean, default: false

  validates :first_name,   presence: true