]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 14 Feb 2014 20:27:31 +0000 (21:27 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 14 Feb 2014 20:27:31 +0000 (21:27 +0100)
commit1a38a48ca13cd85ddb24a755111b98b2284dadef
treeb34a2ad1fdee413de79fb5803a9bb2ca604715ea
parent846efe80f7452640de410e9883a930302165e727
parentd86d2d83c438092dc53220a9518faa21c9592ff8
Merge branch 'dev' into crem

Conflicts:
example/sandbox/settings.py
telemeta/urls.py
telemeta/views/item.py
example/sandbox/settings.py
telemeta/templates/telemeta/base.html
telemeta/views/core.py
telemeta/views/item.py