]> git.parisson.com Git - telemeta.git/commit
projects / telemeta.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c43c968 19f0503)
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Thu, 7 Jun 2012 08:14:49 +0000 (10:14 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 7 Jun 2012 08:14:49 +0000 (10:14 +0200)
commit3e38b890e7a6df009988a4694a7f7065e2be61bd
tree23f4edb73bdce72f45a2d8166f40fad3715ff793tree | snapshot
parentc43c968935f904217f5dce05aebcb1254fb61b6acommit | diff
parent19f0503b791d517bdb083d03f072973a75d1baedcommit | diff
Merge branch 'dev' 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/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/django.po diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.