Merge remote-tracking branch 'origin/master'

2fa04fa3 · 张兴柱 · ae92463e · 0b6f4947 · 2fa04fa3
Commit 2fa04fa3 authored May 30, 2018 by 张兴柱
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

application-prd.yml
+2 -2

No files found.
--- a/application-prd.yml
+++ b/application-prd.yml
@@ -66,4 +66,4 @@ proudkids:
 eeo:
  sid: 1684530
  secret: 1Uk9fXmI
-  folderId: 1674421
\ No newline at end of file
+  folderId: 3696636
\ No newline at end of file