]> git.parisson.com Git - teleforma.git/commit
projects / teleforma.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2fbdb41 488217d)
Merge branch 'crfpa' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 24 Jun 2015 10:54:10 +0000 (12:54 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 24 Jun 2015 10:54:10 +0000 (12:54 +0200)
commit83e5dd72b0125edf19c16b4822edd06c840cb815
tree9181171e5933a84b0455b07bcfdf3b09a74cd4c8tree | snapshot
parent2fbdb41cb170dbc6ed6fe56e317668d6cb7edc43commit | diff
parent488217d0b4ec74de547414f41b8c2339c7010f79commit | diff
Merge branch 'crfpa' into dev

Conflicts:
teleforma/models/core.py
teleforma/models/core.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.