]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 22 Oct 2015 15:39:14 +0000 (17:39 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 22 Oct 2015 15:39:14 +0000 (17:39 +0200)
commit37faea1a3668d79229dbeefe3433839afc2213c4
tree327c81b062a6f883760bce984fa82c177ac2fc58
parent44870c14f415da2c20b7e4fd407459b724589a63
parent73364d568b3dab5a5f2da6d06f78cd977b1bdc67
Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev

Conflicts:
telemeta/locale
telemeta/management/commands/telemeta-import-collections-from-crem.py
telemeta/management/commands/telemeta-import-collections-from-crem.py