]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d00b56 dcdd5a1)
Merge branch 'appointment' of git.parisson.com:git/teleforma into appointment
authorYoan Le Clanche <yoan@ellington.pilotsystems.net>
Wed, 26 Sep 2018 13:09:57 +0000 (15:09 +0200)
committerYoan Le Clanche <yoan@ellington.pilotsystems.net>
Wed, 26 Sep 2018 13:09:57 +0000 (15:09 +0200)
1  2 
teleforma/templates/teleforma/appointments.html patch | diff1 | diff2 | blob | history
teleforma/views/appointment.py patch | diff1 | diff2 | blob | history

diff --cc teleforma/views/appointment.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.