]> git.parisson.com Git - telemeta.git/commit
Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta
authoryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 21:59:57 +0000 (22:59 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 6 Feb 2012 21:59:57 +0000 (22:59 +0100)
commitaef89d3d58fcf23008496025c768d481a87ef8f5
tree529b6f9a3bba074255928e8fda590a5f415a3f37
parenta205ec9a3007f0a8bed0318aa7e93df5dc9af722
parentecd79645f22e25895a689c81c1dd2ab818d6ea17
Merge branch 'crem' of git+ssh://vcs.parisson.com/var/git/telemeta

Conflicts:
telemeta/templates/telemeta_default/base.html
telemeta/models/media.py