]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'appointment' into dev
authorYoan Le Clanche <yoan@ellington.pilotsystems.net>
Wed, 26 Sep 2018 15:33:02 +0000 (17:33 +0200)
committerYoan Le Clanche <yoan@ellington.pilotsystems.net>
Wed, 26 Sep 2018 15:33:02 +0000 (17:33 +0200)
1  2 
teleforma/urls.py
teleforma/views/core.py

Simple merge
Simple merge