]> git.parisson.com Git - django-jqchat.git/commit
Merge branch 'master' of github.com:yomguy/django-jqchat
authoryomguy <yomguy@parisson.com>
Mon, 4 Feb 2013 13:36:07 +0000 (14:36 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 4 Feb 2013 13:36:07 +0000 (14:36 +0100)
commit79367e810789175ec4858462865d103081882846
tree3de9a5933eb085f22a5e4e9675722f3a772257a1
parent5d1dc09cd00e96736bdebc97bce80c07051cda03
parentf44c99cd8c35070d786407fb774e0aa6d67a4070
Merge branch 'master' of github.com:yomguy/django-jqchat

Conflicts:
jqchat/views.py