ynerant 57a01c48a8 Merge branch 'master' into 'tresorerie' ... # Conflicts: # apps/note/fixtures/initial.json # templates/base.html		2020-03-25 00:30:14 +01:00
..
__init__.py	Merge branch 'master' into rights	2020-03-22 00:00:18 +01:00
base.py	Merge branch 'master' into 'tresorerie'	2020-03-25 00:30:14 +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