Merge branch 'master' of git+ssh://git.yukkurigames.com/~/bare/mlpccg-meta
-rw-r--r-- 7 .gitignore
drwxr-xr-x - data
-rw-r--r-- 82944 db.sqlite3
-rw-r--r-- 253 manage.py
drwxr-xr-x - meta
drwxr-xr-x - mlpccg-web
drwxr-xr-x - mlpccg