Merge branch 'master' of github.com:leanote/leanote

This commit is contained in:
life
2014-05-07 13:08:10 +08:00

2
.gitignore vendored
View File

@ -6,5 +6,5 @@ bin/tmp
bin/test
conf/app.conf
conf/routes
public/upload/*
public/upload
.DS_Store