Skip to content

bugzilla
bugzilla
Commit 5f9912c4 authored by System Administrator's avatar System Administrator
Browse files
Options

[etersoft] Cherry-pick 3f52e29c

parent 227c6053
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
template/en/default/etersoft/timersplash.html.tmpl
View file @ 5f9912c4
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< 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?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -83,3 +84,6 @@ ...@@ -83,3 +84,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script>
>>>>>>> 10034a1af (Add ability for no comment when workTime is null) >>>>>>> 10034a1af (Add ability for no comment when workTime is null)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020"></script>
>>>>>>> 3f52e29c4 (Fix bug creating)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ 5f9912c4
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< 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?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -83,3 +84,6 @@ ...@@ -83,3 +84,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020_"></script>
>>>>>>> 10034a1af (Add ability for no comment when workTime is null) >>>>>>> 10034a1af (Add ability for no comment when workTime is null)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020"></script>
>>>>>>> 3f52e29c4 (Fix bug creating)
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