[etersoft] Cherry-pick 2e393ba0

contrib/Bugzilla.pm

@@ -35,7 +35,7 @@ use warnings;
 #                                                                     #
 #######################################################################
 
-use constant BZ_ROOT_DIR => '/usr/share/bugzilla/lib';
+use constant BZ_ROOT_DIR => '/var/www/bugs.etersoft.ru';
 use constant BZ_LIB_DIR  => BZ_ROOT_DIR . '/lib';
 
 #######################################################################

template/en/default/etersoft/timersplash.html.tmpl

@@ -52,6 +52,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>
@@ -71,3 +72,6 @@
 =======
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?08_10_2020"></script>
 >>>>>>> 184e32d1f (Update date in scripts path for scripts reloading)
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?07_10_2020"></script>
+>>>>>>> 2e393ba09 (Fix on enter keyup event form submitting. Update BZ_ROOT_DIR)

template/ru/default/etersoft/timersplash.html.tmpl

@@ -52,6 +52,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>
@@ -71,3 +72,6 @@
 =======
 <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?08_10_2020"></script>
 >>>>>>> 184e32d1f (Update date in scripts path for scripts reloading)
+=======
+<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?07_10_2020"></script>
+>>>>>>> 2e393ba09 (Fix on enter keyup event form submitting. Update BZ_ROOT_DIR)