Yohann D'ANELLO 18f6daf2ac Merge remote-tracking branch 'origin/master' into tresorerie ...

# Conflicts:
#	locale/de/LC_MESSAGES/django.po
#	locale/fr/LC_MESSAGES/django.po
#	note_kfet/settings/base.py
#	templates/base.html

2020-03-22 01:04:03 +01:00

..

__init__.py

Merge branch 'master' into rights

2020-03-22 00:00:18 +01:00

base.py

Merge remote-tracking branch 'origin/master' into tresorerie

2020-03-22 01:04:03 +01:00

development.py

More envs

2020-03-11 15:54:12 +01:00

production.py

More envs

2020-03-11 15:54:12 +01:00

secrets_example.py

modular settings start

2020-03-08 23:03:35 +01:00