]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81c8efc 5d95404)
Merge branch 'ae' into ae-dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 22 Aug 2013 14:53:15 +0000 (16:53 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 22 Aug 2013 14:53:15 +0000 (16:53 +0200)
re-add analytics

Conflicts:
teleforma/templates/postman/email_user_init.txt

1  2 
teleforma/admin.py patch | diff1 | diff2 | blob | history

diff --cc teleforma/admin.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.