]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into lam
authoryomguy <yomguy@parisson.com>
Tue, 18 Dec 2012 09:57:38 +0000 (10:57 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 18 Dec 2012 09:57:38 +0000 (10:57 +0100)
commiteb09396081981a3593ceadded9f11b89d78197f5
treeb2a0fbb0df0d319524ce7157834afa8befd2b324
parenteafcea8e86dc42c51e1695ba03d28d024f0d5bf1
parentb58f35ec9d80b97b9341ec51e6c7a71a44a68fe8
Merge branch 'master' into lam

Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
telemeta/models/media.py
telemeta/views/home.py