aboutsummaryrefslogtreecommitdiff
path: root/templates/index.html
diff options
context:
space:
mode:
authorAlban Gruin2017-02-21 09:23:10 +0100
committerAlban Gruin2017-02-21 09:23:10 +0100
commit7e07a6666436b351bf2d14068e152a03b5603078 (patch)
treeef1e2aeb4283e178dfb5df4d71651bacf9d0a6c3 /templates/index.html
parentb687e245d351e09cdec0ffb548543ced717000e6 (diff)
parentcd004bdf1144b27bcb4de1f4ffd750b6eefcb477 (diff)
Merge branch 'master' into stable/0.6.zv0.6.3stable/0.6.z
Conflicts: templates/mail/mail_timetable.txt
Diffstat (limited to 'templates/index.html')
0 files changed, 0 insertions, 0 deletions