Skip to content

Merge branch 'develop' into DevAlex

Àngel Martínez González requested to merge master into angelmartinez

Conflicts:

src/main/java/com/erphotel/AuthSecurity/controller/ConfigurationAutentificator.java

src/main/resources/static/booking/style.css

Merge request reports