Skip to content

bugzilla
bugzilla
Commit 2508b782 authored by System Administrator's avatar System Administrator
Browse files
Options

[etersoft] Cherry-pick 184e32d1

parent 5b41d1be
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
template/en/default/etersoft/timersplash.html.tmpl
View file @ 2508b782
......@@ -51,6 +51,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
......@@ -67,3 +68,6 @@
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020"></script>
>>>>>>> ad36ea0d5 (Update scripts version)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?08_10_2020"></script>
>>>>>>> 184e32d1f (Update date in scripts path for scripts reloading)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ 2508b782
......@@ -51,6 +51,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
......@@ -67,3 +68,6 @@
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020"></script>
>>>>>>> ad36ea0d5 (Update scripts version)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?08_10_2020"></script>
>>>>>>> 184e32d1f (Update date in scripts path for scripts reloading)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment