Merge branch 'develop' into szzh

This commit is contained in:
sw 2015-04-13 10:56:49 +08:00
commit a0f01469a0
1 changed files with 2 additions and 0 deletions

2
.gitignore vendored
View File

@ -24,3 +24,5 @@ public/api_doc/
/.metadata
vendor/cache
/files
/public/images/avatars
/public/files