Skip to content
Snippets Groups Projects
Commit a6fffe6a authored by Ethan Allen-Harris's avatar Ethan Allen-Harris
Browse files

Merge branch 'issueFour' into develop

# Conflicts:
#	src/main/java/com/example/clientproject/config/SecurityConfig.java
parents e928567d f34e6287
No related branches found
No related tags found
4 merge requests!56tags will be saved to userFavTags table (needs user ID of current logged in user),!22Branch Update,!19created signUp page and form that sends data to controller,!17Removal of "AUTO_INCREMENT" on AdminTypes id field since there will only ever...
Showing
with 499 additions and 35 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment