Skip to content
Snippets Groups Projects
Commit 6f737471 authored by ynerant's avatar ynerant
Browse files

Merge branch 'master' into 'logging' 

# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
parents b23237f6 7303fb99
No related branches found
No related tags found
Pipeline #7839 passed with warnings with stages
in 4 minutes and 3 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 2000 additions and 148 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