]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 360c154 d82ef65)
Merge branch 'prodev' of git.parisson.com:git/teleforma into prodev
authorYoan Le Clanche <yoan@ellington.pilotsystems.net>
Wed, 12 Dec 2018 14:12:55 +0000 (15:12 +0100)
committerYoan Le Clanche <yoan@ellington.pilotsystems.net>
Wed, 12 Dec 2018 14:12:55 +0000 (15:12 +0100)
1  2 
teleforma/context_processors.py patch | diff1 | diff2 | blob | history
teleforma/views/pro.py patch | diff1 | diff2 | blob | history

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