]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:45:24 +0000 (18:45 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:45:24 +0000 (18:45 +0200)
commitc1c04ef5232180ea07b5a271d2c0f6b1ecd06de6
treeace22b6351a55436df3502167f2ea4a16df84ef0
parent4d6b8cce72b9bb84d4a319ebfe36f9f49b6aa98e
parent09b666a82fb89ab25d1bf9c6b0050b7793d35f3e
Merge branch 'dev' into crem

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