#1226: Merge branch 'master' into v5

This commit is contained in:
Anyon 2019-07-19 11:48:21 +08:00
commit a711a97be9
2 changed files with 18 additions and 36 deletions

@ -1 +1 @@
Subproject commit 518efd49ab4f34a0a8d8b8ce88eb3d88cfb89ecc
Subproject commit 2ea518d7aef6f58608ec3f0c3b2ac54bb022f40c

View File

@ -2,40 +2,22 @@
branches: {
}
fileChange:
/vendor:
newFile: !uuid '1f25d50fb9a7a9ecb3521265c0c01080b72627ed'
oldFile: !uuid '00545a20cb74621442b16e441b77c7970d1c37f7'
/vendor/autoload.php:
newFile: !uuid 'ec37f53f7373c43183564388adb644e6809ee263'
oldFile: !uuid 'a0f34226f55bb5a48592773e20091e1416cfae6a'
/vendor/composer:
newFile: !uuid '306c5bf59ab64164f81118c0a012f988d87253c8'
oldFile: !uuid 'bce0a10659b3f6929bfff2b567b42be49b027ef1'
/vendor/composer/autoload_real.php:
newFile: !uuid '1da220454ac1a029aefe643f937f9f7d8ab1379d'
oldFile: !uuid '653f50d495ac15b38902cabf3e0249ea2e1d4709'
/vendor/composer/autoload_static.php:
newFile: !uuid 'dae97cc4d797a76c8492498da069772e30ca2645'
oldFile: !uuid '498a93952f66e81bea648411754c0fd4139a9305'
/vendor/composer/installed.json:
newFile: !uuid '1810efee9721792a2b060ec3667c992ae08f10f4'
oldFile: !uuid '00501b224d57074268493b95d02964b7b18fe3d9'
/vendor/zoujingli:
newFile: !uuid '99b8d55985a0e6710cbffa52e804356d7ed42d72'
oldFile: !uuid '71db935238d09f8095edb6ad98828bb1fa8265a0'
/vendor/zoujingli/think-library:
newFile: !uuid 'ca8c5caf954012112855a9eeefe16647cdbee26f'
oldFile: !uuid 'e5f30ba2ef8fb2b86aa5444ac77cedd315109dd6'
/vendor/zoujingli/think-library/src:
newFile: !uuid 'b2878a68f7c14c664740f01f7b5b6d88b11677c8'
oldFile: !uuid 'a3a84ff0be76551516cdaa166b83992bfc22d8ef'
/vendor/zoujingli/think-library/src/command:
newFile: !uuid 'd799768395900ef865d592e9e8a4dcbcbf10c5c4'
oldFile: !uuid 'b69f4d60c49a9f026d92453c5a43e43e8fb40db1'
/vendor/zoujingli/think-library/src/command/Sync.php:
newFile: !uuid '10aecc13e4ce25848f6c222aa31f2268fade4685'
oldFile: !uuid '21c7f44796b0e7df5d0345e01d2c2136590253d4'
gitCommitId: !uuid '518efd49ab4f34a0a8d8b8ce88eb3d88cfb89ecc'
/application:
newFile: !uuid '2acb28fc3b534b6b649cdf055f9f1cd1b369cc60'
oldFile: !uuid 'fedb56170ccb63e8fd98196a78e18247b6e8c78d'
/application/admin:
newFile: !uuid '2a34560b8087258d4b080b696642543116e9cb45'
oldFile: !uuid '5334bc8be4a41c0a0d4a4543af892b0f7c913bd5'
/application/admin/controller:
newFile: !uuid '9d9b36ef5fdf7d119636e9b0dd34666f6106b795'
oldFile: !uuid '7b8c656418d3e5b2f32321d801135cd5d0f0d883'
/application/admin/controller/api:
newFile: !uuid '6ab65916ab03ebbd134a8c0bce03c2cb2567e100'
oldFile: !uuid '89e07025b08a587096ebdfacfbf8079fe68c4795'
/application/admin/controller/api/Update.php:
newFile: !uuid '96b9421122091968404abf53e7333ed3a79654cd'
oldFile: !uuid 'c460edbe628bccb248231f0bcb21f8bec2736557'
gitCommitId: !uuid '2ea518d7aef6f58608ec3f0c3b2ac54bb022f40c'
renames: {
}
revisionId: 1225
revisionId: 1226