Skip to content
Snippets Groups Projects
Commit 11cd5ba9 authored by Zhicheng Xu's avatar Zhicheng Xu
Browse files

Merge branch 'main' of...

Merge branch 'main' of https://git.cardiff.ac.uk/c24020257/sports-league-application into 69-as-a-user-i-want-a-rules-page-with-a-search-bar-and-three-links-each-link-to-the-rules-of-darts

# Conflicts:
#	src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java
parents 634f70c5 2809e372
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment