Skip to content

Merge remote-tracking branch 'origin/comment_jiaxuan'

Jiaxuan Liang requested to merge comment_jiaxuan into master

Conflicts:

target/classes/com/bjss/desk_booking/WebSecurityConfig.class

target/classes/static/css/BookingStyle.css

target/classes/templates/fragments/header.html

Merge request reports