Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta
authorJess <jessicatz.fairymeadow@gmail.com>
Mon, 25 Aug 2014 22:09:02 +0000 (00:09 +0200)
committerJess <jessicatz.fairymeadow@gmail.com>
Mon, 25 Aug 2014 22:09:02 +0000 (00:09 +0200)
commit0460c3c46cd330bbae7043e42a8a490662bf1e60
tree77c89af0537a7bb9c7968dc20fd68cce64ab4245
parentf5f267a53e90455937409ad2bd15324e717c8e04
parent0f08a0d1ebcd8d825a7df448221a7eb23600bba5
Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta

Conflicts:
main.py
mlpccg/CardDb.pyc
mlpccg/Clustering.py
mlpccg/Clustering.pyc
mlpccg/DeckList.pyc
static/index.html
.gitignore
mlpccg/CardDb.pyc
mlpccg/Clustering.pyc
mlpccg/DeckList.pyc
mlpccg/__init__.pyc