]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 22:49:43 +0000 (23:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 22:49:43 +0000 (23:49 +0100)
commit846efe80f7452640de410e9883a930302165e727
tree0d710aed00f6e57fd519dc09fd3f88a903793205
parentbe202df7151cdaff1a82fd6b389a767a94523144
parentadb913e696b281d53ec3fbc171e10981a2c9d555
Merge branch 'dev' into crem2

Conflicts:
telemeta/views/collection.py