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

git-as-svn/v1/master
LSZ 2016-06-07 21:51:42 +08:00
parent fcb53a47ab
commit 9ffd7436e2
2 changed files with 6 additions and 21 deletions

@ -1 +1 @@
Subproject commit 7bd0f6bb0fdde72ec75b5a37c065974302fb89c9
Subproject commit b333791785f8c28c84b3cb3f9c527a984f82f6da

View File

@ -2,25 +2,10 @@
branches: {
}
fileChange:
/src:
newFile: !uuid '14dec3aa0929706b41d25b34eab30492d6b508b9'
oldFile: !uuid '370cfd7e078fccbdd3a5b13fffa31be86b4602d0'
/src/main:
newFile: !uuid '9666f062474e74e4341bc415ae4093dd6a5b8df7'
oldFile: !uuid 'bb104362807b98e9a4e243af8fde54c878a61c3b'
/src/main/webapp:
newFile: !uuid '282688c57545dc04310363ab3f4cc69e41142d71'
oldFile: !uuid '30dc4db550bf8389191d4d0f6c20745acdae5ddb'
/src/main/webapp/WEB-INF:
newFile: !uuid '7272ecb8d77aed7fda97528ae92af4f21fd72e8c'
oldFile: !uuid 'ae3997de2ce1f2f0fe2baf643c88cde76c65c391'
/src/main/webapp/WEB-INF/jsp:
newFile: !uuid '5bd7e8e3b3c1d85921b96d6ab85d8cb2dd9e51f4'
oldFile: !uuid '0361ec8290cdd653fdbec1db435f676aaa36206e'
/src/main/webapp/WEB-INF/jsp/user_form.jsp:
newFile: !uuid '351a496bf611dc752bbe04dceefddde02a99a2cc'
oldFile: !uuid 'c2aa467f9e104be0dca820cb7e1ed67e0e368d6e'
gitCommitId: !uuid '7bd0f6bb0fdde72ec75b5a37c065974302fb89c9'
/index.html:
newFile: !uuid 'fd48a5b8525d01a9f65892725c002d76e389ec73'
oldFile: null
gitCommitId: !uuid 'b333791785f8c28c84b3cb3f9c527a984f82f6da'
renames: {
}
revisionId: 219
revisionId: 220