]> git.parisson.com Git - django-jqchat.git/commitdiff
projects / django-jqchat.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d1dc09 f44c99c)
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)
Conflicts:
jqchat/views.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.