]> git.parisson.com Git - django-postman.git/commit
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/django-postman
authoryomguy <yomguy@parisson.com>
Mon, 24 Sep 2012 12:19:18 +0000 (14:19 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 24 Sep 2012 12:19:18 +0000 (14:19 +0200)
commitcda5aadcd285f38f0d6c514f1e54867f87bfd86e
tree5e29765df1e2ae39000bb25a5d8e94c75a666c68
parent2894609500e1b978fd41ed7e1663c5329c3fda65
parentdcea2b745ee6fac6ad1721470356616cc4db68fd
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/django-postman

Conflicts:
MANIFEST.in
docs/conf.py
postman/__init__.py
postman/locale/de/LC_MESSAGES/django.po
postman/templates/postman/base.html
postman/templates/postman/base_write.html
postman/test_urls.py
postman/tests.py
postman/utils.py
MANIFEST.in
postman/templates/postman/base.html
postman/templates/postman/base_write.html
postman/tests.py
postman/utils.py