Skip to content
GitLab
Explore
Sign in
Merge branch 'develop' into DevAlex
Code
Review changes
Check out branch
Download
Patches
Plain diff
Àngel Martínez González
requested to merge
master
into
angelmartinez
Apr 19, 2023
Overview
0
Commits
22
Pipelines
0
Changes
46
Expand
Conflicts:
src/main/java/com/erphotel/AuthSecurity/controller/ConfigurationAutentificator.java
src/main/resources/static/booking/style.css
Merge request reports