Skip to content
Snippets Groups Projects
Commit a8185c96 authored by Jonathan Foucher's avatar Jonathan Foucher
Browse files

Merge branch 'feature/notification-module-interface' into feature/generate-notifications 

# Conflicts:
#	templates/_header.html.twig
parent 097e5c87
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 681 additions and 48 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