Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

11 years ago · 8042d08479
parent 87ccf94eb7 5b8dce0036
commit 8042d08479
3 changed files with 3 additions and 1 deletions
--- a/templates/client/static_client/js/main.js
+++ b/templates/client/static_client/js/main.js
@ -366,6 +366,7 @@ function placeInput(width){
 					mode:'horizontal',
 					loop: false,
 					simulateTouch: false,
 					autoplay:4200,
 					onInit: function () {
 						$recPrev.addClass('disabled');
 					},
--- a/templates/client/static_client/js/vendor.js
+++ b/templates/client/static_client/js/vendor.js
@ -3407,6 +3407,7 @@ function placeInput(width){
 					mode:'horizontal',
 					loop: false,
 					simulateTouch: false,
 					autoplay:6200,
 					onInit: function () {
 						$recPrev.addClass('disabled');
 					},
--- a/templates/client/static_client/js_min/vendor.min.js
+++ b/templates/client/static_client/js_min/vendor.min.js