]> git.parisson.com Git - django-postman.git/commitdiff
projects / django-postman.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46dce24 0c135b9)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Oct 2013 10:45:48 +0000 (12:45 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Oct 2013 10:45:48 +0000 (12:45 +0200)
1  2 
postman/models.py patch | diff1 | diff2 | blob | history

diff --cc postman/models.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.