Skip to content
Snippets Groups Projects
Commit 17700e00 authored by gnaegi's avatar gnaegi
Browse files

Merge OpenOLAT-10.5.x to OpenOLAT-11.0 with 4f2b23df0ad2bc12090145b68e3b6d94e51cb218

parents 0658d9b2 6f95272a
No related branches found
No related tags found
No related merge requests found
......@@ -147,3 +147,6 @@ f1a0784814fb3b4b6e707c528ea8e50002a72036 OpenOLAT 10.5.0
565dcbf2b2e5bddb686304b07a592f7fe72b09a6 OpenOLAT 10.5.4
4d7a4ed43243ee2ab327ac158cce871fa0088a5a OpenOLAT 10.5.5
270573c5dcf34117dc974c6b3afee264e31050d7 OpenOLAT 11.0 0
7cf357f90585ebe995cec3f28e18b5519994a932 OpenOLAT 10.5.6
7cf357f90585ebe995cec3f28e18b5519994a932 OpenOLAT 10.5.6
2c40c9d756b8a2cde6de65e76098457945638f80 OpenOLAT 10.5.6
<h4>$r.translate("cal.icalfeed.aggregated.title")</h4>
<div class="o_info">$r.translate("cal.icalfeed.aggregated.info")</div>
<div class="clearfix"><a href="$icalFeedLink">$icalFeedLink</a></div>
\ No newline at end of file
<div class="clearfix"><input type="text" value="$icalFeedLink" style="width:100%;" onclick="this.select();"/></div>
\ No newline at end of file
<h4>$r.translate("cal.icalfeed.title")</h4>
<div class="o_info">$r.translate("cal.icalfeed.info")</div>
<div class="clearfix"><a href="$icalFeedLink">$icalFeedLink</a></div>
\ No newline at end of file
<div class="clearfix"><input type="text" value="$icalFeedLink" style="width:100%;" onclick="this.select();"/></div>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment