fixes conflicts

2015-09-14 16:46:00 +02:00
parent e9e339fa50 1e96bba262
commit c9e46e3d8f
21 changed files with 87 additions and 59 deletions
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -108,7 +108,7 @@ class Proposal < ActiveRecord::Base
  end

  def self.votes_needed_for_success
-    53726
+    Setting.value_for('votes_for_proposal_success').to_i
  end

  protected