merge latest

2018-05-14 20:17:30 +02:00
parent c2ebdcbefc 0f683ac974
commit 502aae5c27
21 changed files with 652 additions and 110 deletions
--- a/app/views/documents/write_etherpad.html.erb
+++ b/app/views/documents/write_etherpad.html.erb
@@ -1 +1 @@
-<%= link_to "weiter" , "http://www.fet.at/etherpad/p/"+@document.ep_pad.id , target: :blank %>
+<%= link_to "weiter" , "https://www.fet.at/etherpad/p/"+@document.ep_pad.id , target: :blank %>