Merge remote-tracking branch 'origin/master'

This commit is contained in:
상희 김 2015-09-09 22:55:54 +02:00
commit 5b7c9584db
19 changed files with 773 additions and 361 deletions

4
.gitignore vendored
View file

@ -19,3 +19,7 @@ static/
\#*#
.\#*
*~*
static/
secret-key