From 882c0b2793519e2e7d9d3d724d8efab093155df3 Mon Sep 17 00:00:00 2001 From: lishengzhao Date: Tue, 11 Nov 2014 16:46:07 +0800 Subject: [PATCH] #35: Merge remote-tracking branch 'origin/master' --- commit.ref | 2 +- commit.yml | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/commit.ref b/commit.ref index 1bad2d4..06c0045 160000 --- a/commit.ref +++ b/commit.ref @@ -1 +1 @@ -Subproject commit 1bad2d4b8cc93ffc3c9ec3e6ad2960d451f9567c +Subproject commit 06c00459c54805392231a7c6f56607b78f62ebd9 diff --git a/commit.yml b/commit.yml index b6d1176..eef4dd9 100644 --- a/commit.yml +++ b/commit.yml @@ -2,13 +2,10 @@ branches: { } fileChange: - /others: - newFile: !uuid 'de7da7f641f6f6035b83022a655fcba37278f248' - oldFile: !uuid '501061708da9fded0a254d352086ed7a9973a819' - /others/oauth_test.txt: - newFile: !uuid '76c09e9376df10b45eaaeee94d1a5d8792c674a8' - oldFile: !uuid '04ccfb79d244b08b3d8f62a19e11898c4e38917c' -gitCommitId: !uuid '1bad2d4b8cc93ffc3c9ec3e6ad2960d451f9567c' + /README.md: + newFile: !uuid '02a0b279c466fbd80843eb7ec39ba5aba3a3e7b2' + oldFile: !uuid 'b3408757c93b561f532a68e400b909becf84bc80' +gitCommitId: !uuid '06c00459c54805392231a7c6f56607b78f62ebd9' renames: { } -revisionId: 34 +revisionId: 35