#35: Merge remote-tracking branch 'origin/master'

git-as-svn/v1/config
lishengzhao 2014-11-11 16:46:07 +08:00
commit 7d212fa123
2 changed files with 6 additions and 9 deletions

@ -1 +1 @@
Subproject commit 1bad2d4b8cc93ffc3c9ec3e6ad2960d451f9567c
Subproject commit 06c00459c54805392231a7c6f56607b78f62ebd9

View File

@ -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