]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:05:53 +0000 (15:05 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:05:53 +0000 (15:05 +0200)
commit2514949c36bc9ab7945fe64b3aaaa98632a32f90
treef8d29421169d2e9b22e879905c344640de8267b8
parentc1c04ef5232180ea07b5a271d2c0f6b1ecd06de6
parentdb98590b1b0a847bb4303fd6b9866d062412a9a3
Merge branch 'dev' into crem

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