Merge branch 'release/1.4' into develop
Merge branch 'hotfix/1.4.1' into develop
Merge branch 'hotfix/1.4.2' into develop
Merge branch 'hotfix/1.4.3' into develop
fixing css
fixing bugs with js
adding config.assets.precompile += %w(dropdown-menu.js hotels.js main.js plugins.js).
i works fine
adding config.assets.precompile += %w(vendor/bootstrap.js vendor/bootstrap.min.js vendor/bootstrap-datetimepicker.min.js vendor/enquire.min.js vendor/jquery.anythingslider.min.js vendor/jquery-1.10.2.min.js vendor/jquery-2.0.0.js vendor/jquery-2.0.0.min.js vendor/modernizr-2.6.2.min.js vendor/moment.min.js)
i works fine
fixing problems with images on css main.css
fixing problems with images on css main.css
fixing problems with images on css main.css
testing production environment
testing production environment
removing proxy
Merge branch 'release/1.5'