#447: Merge origin/master

This commit is contained in:
Anyon 2017-04-26 15:45:18 +08:00
commit 2eb45ffb52
2 changed files with 6 additions and 15 deletions

@ -1 +1 @@
Subproject commit c2eeb7ab2af442657f0cec08dfe6cd3a0b9c9bd6
Subproject commit da511affc16c2b6d06efd0297effabed9d7ca0a3

View File

@ -2,19 +2,10 @@
branches: {
}
fileChange:
/application:
newFile: !uuid '6826f5515f931ffa752b605484358fe1ba6e374d'
oldFile: !uuid '65581d5dde977cc299eec8baa1cc7dae11c2f383'
/application/wechat:
newFile: !uuid '9224d40689ea833332f81683f4b54e3739f90d0a'
oldFile: !uuid '6f576dcdff28f5cc8b612801e6e299aa3344eac0'
/application/wechat/controller:
newFile: !uuid 'b028facf31f879c5a58674795eaf91703fc9c527'
oldFile: !uuid 'f07a56224c8860969c1732607e10824521bd3162'
/application/wechat/controller/News.php:
newFile: !uuid '12c1a0d7a867f6df6e8f32154da9ab3c03cb9393'
oldFile: !uuid '4138e05f0fc8cbb46390050b219cbf70ba8f8c5d'
gitCommitId: !uuid 'c2eeb7ab2af442657f0cec08dfe6cd3a0b9c9bd6'
/composer.lock:
newFile: null
oldFile: !uuid '70a230d195996504f39a974381134ead64f9e45a'
gitCommitId: !uuid 'da511affc16c2b6d06efd0297effabed9d7ca0a3'
renames: {
}
revisionId: 446
revisionId: 447