]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ab91b6 690efab)
Merge branch 'dev' into ae
authoryomguy <yomguy@parisson.com>
Sun, 4 Nov 2012 22:54:03 +0000 (23:54 +0100)
committeryomguy <yomguy@parisson.com>
Sun, 4 Nov 2012 22:54:03 +0000 (23:54 +0100)
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.