Merge branch 'latest' of https://git.triton.fet.at/git/fetsite into latest

2017-05-13 23:04:50 +02:00
parent 37aab0ef59 4ed35f184c
commit bbfb5e6a1d
1 changed files with 1 additions and 1 deletions
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -24,7 +24,7 @@ class Document < ActiveRecord::Base
    "document_"+self.id.to_s
  end
  def self.ether
-    EtherpadLite.connect('http://www.etherpad.fet.at', File.new('config/etherpad/APIKEY.txt'))
+    EtherpadLite.connect('https://www.etherpad.fet.at', File.new('config/etherpad/APIKEY.txt'))
  end
  def create_pdf
      require "open3"