modified:   _ide_helper.php
	modified:   app/config/app.php
	modified:   app/controllers/PostController.php
	modified:   app/controllers/backend/UserController.php
	modified:   app/routes.php
	modified:   app/views/backend/pages/user-all.blade.php
	modified:   app/views/font/post.blade.php
	modified:   app/views/index.blade.php
	modified:   composer.json
	modified:   app/config/app.php
	modified:   app/routes.php
	modified:   app/views/font/post.blade.php
	modified:   composer.json
	modified:   composer.lock
	modified:   vendor/autoload.php
	modified:   vendor/composer/autoload_classmap.php
	modified:   vendor/composer/autoload_namespaces.php
	modified:   vendor/composer/autoload_real.php
	modified:   vendor/composer/installed.json
	new file:   vendor/cooper/wechat/.gitignore
	new file:   vendor/cooper/wechat/.travis.yml
	new file:   vendor/cooper/wechat/README.md
	new file:   vendor/cooper/wechat/composer.json
	new file:   vendor/cooper/wechat/phpunit.xml
	new file:   vendor/cooper/wechat/src/Cooper/Wechat/Facades/WeChatClient.php
	new file:   vendor/cooper/wechat/src/Cooper/Wechat/Facades/WeChatServer.php
	new file:   vendor/cooper/wechat/src/Cooper/Wechat/WeChatClient.php
	new file:   vendor/cooper/wechat/src/Cooper/Wechat/WeChatEmoji.php
	new file:   vendor/cooper/wechat/src/Cooper/Wechat/WeChatServer.php
	new file:   vendor/cooper/wechat/src/Cooper/Wechat/WechatServiceProvider.php
	new file:   vendor/cooper/wechat/src/_ide_helper_for_wechat.php
	new file:   vendor/cooper/wechat/src/config/.gitkeep
	new file:   vendor/cooper/wechat/src/config/wechat.php
	new file:   vendor/cooper/wechat/src/controllers/.gitkeep
	new file:   vendor/cooper/wechat/src/controllers/WechatController.php
	new file:   vendor/cooper/wechat/src/filters.php
	new file:   vendor/cooper/wechat/src/routes.php
	modified:   vendor/stack/builder/.travis.yml
	modified:   vendor/stack/builder/CHANGELOG.md
	modified:   vendor/stack/builder/src/Stack/StackedHttpKernel.php
	modified:   vendor/stack/builder/tests/unit/Stack/StackedHttpKernelTest.php

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	app/config/packages/cooper/
	new file:   app/config/packages/cooper/wechat/.gitkeep
new file:   app/config/packages/cooper/wechat/wechat.php
Merge branch 'master' of https://github.com/notech/tzs

Conflicts:
	app/views/font/post.blade.php