]> git.parisson.com Git - telemeta.git/commit
projects / telemeta.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 50649a4 889d46b)
Merge branch 'dj1.6' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Nov 2014 17:22:04 +0000 (18:22 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 20 Nov 2014 17:22:04 +0000 (18:22 +0100)
commit5274f462fcde8359b38d14b495b4274941a0d7ea
tree51a56073cfa4c0597efc67f924a423db0cccbd96tree | snapshot
parent50649a42d6b71b85407b411a4ec5275dc148bafbcommit | diff
parent889d46be23960bb758ce91b317572e63db29eba6commit | diff
Merge branch 'dj1.6' into dev

Conflicts:
README.rst
README.rst diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.