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

git-as-svn/v1/master
LSZ 2016-06-15 23:44:17 +08:00
parent aa95df5cad
commit 5bbb2c2526
2 changed files with 6 additions and 21 deletions

@ -1 +1 @@
Subproject commit 464519ca68110d819b176768600a625be1cadd29
Subproject commit 8bcac9686e1508b7dafd9fb3b8df1ccb7426f646

View File

@ -2,25 +2,10 @@
branches: {
}
fileChange:
/pom.xml:
newFile: !uuid '76d239431a806e4230ae841197fb14b454e361e4'
oldFile: !uuid '414c7d34b11e8521e7ecef7e9873ee73b9e4b413'
/src:
newFile: !uuid '8599a2f3a1fbd8b3db71b925535a78b1ccbf2e25'
oldFile: !uuid 'd81cc938c6173c38950ee8e7a19537641f2eff88'
/src/main:
newFile: !uuid '9593943e1dd3675671ed16591fe404619ee65654'
oldFile: !uuid 'c63cdba9f964d79cc2f24a634fb4170fa56216bd'
/src/main/webapp:
newFile: !uuid '5ec8844a857508f36b83df6cf704faf0bf4054fe'
oldFile: !uuid '8b1ab33f105c95aabe2ab5ebbe6a95478dbdd60d'
/src/main/webapp/WEB-INF:
newFile: !uuid '62fa0157f9de7e40514d4d310ed1c1baa1037ed2'
oldFile: !uuid '1637b6614dd009a285d0b84f2745f56af19379ed'
/src/main/webapp/WEB-INF/web.xml:
newFile: !uuid 'c87803258f2b72a9ab840940cb538fec159a19c0'
oldFile: !uuid 'c70e61b0e9af5560b0d2e0a5fd0cd9722c1c1065'
gitCommitId: !uuid '464519ca68110d819b176768600a625be1cadd29'
/README.md:
newFile: !uuid '56c39e7a802f07f2dc07fe3f9818ddcf2fde3a5d'
oldFile: !uuid 'ef05b8c2000f100872a1a43017656b5f7d113502'
gitCommitId: !uuid '8bcac9686e1508b7dafd9fb3b8df1ccb7426f646'
renames: {
}
revisionId: 223
revisionId: 224