Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'master' of github.com:yetone/collipa
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'master' of github.com:yetone/collipa
fix bug: fix cannot upload avatar bug
Merge branch 'production' of git.collipa.com:collipa into production
Merge branch 'development'
Merge branch 'master' of github.com:yetone/collipa