mlpccg-meta.git
7 years agoMerge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta
Jess [Mon, 25 Aug 2014 22:09:02 +0000 (00:09 +0200)]
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

7 years agotry out django
Jess [Sat, 23 Aug 2014 14:59:30 +0000 (16:59 +0200)]
try out django

7 years agotry out django
Jess [Sat, 23 Aug 2014 14:59:30 +0000 (16:59 +0200)]
try out django

7 years agoscrew git
Jess [Fri, 22 Aug 2014 13:49:28 +0000 (15:49 +0200)]
screw git

7 years agomove static web content into designated static/ folder
Jess [Fri, 22 Aug 2014 13:47:43 +0000 (15:47 +0200)]
move static web content into designated static/ folder

7 years agox# Please enter the commit message for your changes. Lines starting
Jess [Fri, 22 Aug 2014 13:44:38 +0000 (15:44 +0200)]
x# Please enter the commit message for your changes. Lines starting

7 years agobacon
Jess [Fri, 22 Aug 2014 13:19:55 +0000 (15:19 +0200)]
bacon