]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 12:14:19 +0000 (14:14 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 12:14:19 +0000 (14:14 +0200)
commit9a56321fce7aa63290a3e4e41fdbb5f78214bca3
tree522b43e569104bea2a8e04d602a629e5173df4f4
parentd2a987d250da4b9a03e41d58dd972fcb564505ee
parent51b1310ff418eabebae69d546c06bf369260f9d3
Merge branch 'dev' into lam

Conflicts:
telemeta/forms/media.py
telemeta/templates/telemeta/mediaitem_edit.html
telemeta/forms/media.py