]> git.parisson.com Git - teleforma.git/commit
projects / teleforma.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 974c457) | patch
Fix merge issues
authorYoan Le Clanche <yoanl@pilotsystems.net>
Wed, 2 Dec 2020 12:46:49 +0000 (13:46 +0100)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Wed, 2 Dec 2020 12:46:49 +0000 (13:46 +0100)
commit5c4dee47ac71f2d6f3764b70d35af7296428759f
tree70b91bc35ffcf954e7f12c6e9d340518d4b79d3ctree | snapshot
parent974c457a97e10317ceda847caa4124c693e638bdcommit | diff
Fix merge issues
teleforma/admin.py diff | blob | history
teleforma/exam/models.py diff | blob | history
teleforma/exam/templates/exam/script_detail.html diff | blob | history
teleforma/migrations/0099_auto__add_appointmentjury__add_appointmentperiod__add_appointmentday__.py diff | blob | history
teleforma/migrations/0100_auto__chg_field_period_appointment_slot_size.py diff | blob | history
teleforma/migrations/0104_auto__del_appointmentday__del_field_appointmentperiod_book_delay__del_.py diff | blob | history
teleforma/models/__init__.py diff | blob | history
teleforma/models/pro.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.