]> git.parisson.com Git - django-postman.git/commit
Merge branch 'fix' into probarreau
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Apr 2013 13:31:17 +0000 (15:31 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Apr 2013 13:31:17 +0000 (15:31 +0200)
commiteedba32bb0aaefbb03bf8885b5bc9dc0149c6bd3
treecc54de4e69bce1d231380b0244cde0d21364e4a7
parentdebf601005ed879668363ddc7c7a6676b3c702b5
parent9f77032ba60a7d98f3dd38672cd957d1ea8d02e6
Merge branch 'fix' into probarreau

Conflicts:
postman/models.py
postman/templatetags/postman_tags.py
postman/models.py
postman/templatetags/postman_tags.py