]> git.parisson.com Git - telemeta.git/commit
Merge branch 'new_branch_name' into develop
authoryomguy <yomguy@parisson.com>
Fri, 18 May 2012 09:31:20 +0000 (11:31 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 18 May 2012 09:31:20 +0000 (11:31 +0200)
commit5d72619611e5664f5369f3d45351f391f35610b4
treee89a5b7c47861e6cb0204ea965e7c772ed3677e2
parentad264be88b7008c436d6106eda01b317008383f0
parentf84855f9dbdf0f6a4caf586d0dc36d77d2ae1a42
Merge branch 'new_branch_name' into develop

Conflicts:
telemeta/models/format.py
telemeta/models/media.py