Skip to content
Snippets Groups Projects
Commit 40fa7c59 authored by Elisabethein's avatar Elisabethein
Browse files

Merge remote-tracking branch 'emergency-alert-application/Annabel' into Elisabet 

# Conflicts:
#	EmergencyAlertApplication.jar
#	eaa_frontend/src/pages/AlertPage.vue
#	src/main/java/com/EmergencyAlertApplication/EAA/Configurations/SecurityConfig.java
parents 21f7b6d8 d8bc9ad2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 523 additions and 17 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment