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

This commit is contained in:
root
2017-05-13 23:04:50 +02:00

View File

@@ -24,7 +24,7 @@ class Document < ActiveRecord::Base
"document_"+self.id.to_s "document_"+self.id.to_s
end end
def self.ether 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 end
def create_pdf def create_pdf
require "open3" require "open3"