]> git.parisson.com Git - teleforma.git/commit
projects / teleforma.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: be0a4cd 4ee307c)
Merge branch 'pdfannotator' into dev pdfannotator
authorGuillaume Pellerin <yomguy@parisson.com>
Sat, 3 Aug 2019 15:21:56 +0000 (17:21 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sat, 3 Aug 2019 15:21:56 +0000 (17:21 +0200)
commit6b2453202d954d9a6ea16a5f553a362c694f2eb9
treea242e7ea8e134ee1cc04bd0565a45ebb345d2781tree | snapshot
parentbe0a4cdae17767b66ad2accc0fa316af2a24d7aacommit | diff
parent4ee307cc959a6d52174178b3a7bab552503e9ffdcommit | diff
Merge branch 'pdfannotator' into dev

Conflicts:
teleforma/exam/models.py
teleforma/exam/models.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.