diff options
| author | Alban Gruin | 2017-02-21 09:23:10 +0100 |
|---|---|---|
| committer | Alban Gruin | 2017-02-21 09:23:10 +0100 |
| commit | 7e07a6666436b351bf2d14068e152a03b5603078 (patch) | |
| tree | ef1e2aeb4283e178dfb5df4d71651bacf9d0a6c3 /admin.py | |
| parent | b687e245d351e09cdec0ffb548543ced717000e6 (diff) | |
| parent | cd004bdf1144b27bcb4de1f4ffd750b6eefcb477 (diff) | |
Merge branch 'master' into stable/0.6.zv0.6.3stable/0.6.z
Conflicts:
templates/mail/mail_timetable.txt
Diffstat (limited to 'admin.py')
0 files changed, 0 insertions, 0 deletions