Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
leedar360 committed Oct 10, 2015
2 parents 94535a9 + 7bc9755 commit 475a799
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/resources/config.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#\u76f8\u5bf9\u8def\u5f84
#\u56fe\u7247\u76ee\u5f55
upload.dir=pic
upload.dir=upload
#\u7403\u961f\u76ee\u5f55
team.dir=team
#\u8d5b\u4e8b\u76ee\u5f55
Expand Down

0 comments on commit 475a799

Please sign in to comment.