Skip to content
Snippets Groups Projects
Commit 57a01c48 authored by ynerant's avatar ynerant
Browse files

Merge branch 'master' into 'tresorerie' 

# Conflicts:
#   apps/note/fixtures/initial.json
#   templates/base.html
parents 075cb1b5 0ac94547
No related branches found
No related tags found
1 merge request!61Tresorerie
Pipeline #8026 passed with warnings with stages
in 3 minutes and 34 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 166 additions and 59 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