Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/top-think/framework
Browse files Browse the repository at this point in the history
  • Loading branch information
liu21st committed Dec 13, 2017
2 parents 6231c45 + 945a1e2 commit 29803c0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

ThinkPHP遵循Apache2开源协议发布,并提供免费使用。
版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn)
版权所有Copyright © 2006-2017 by ThinkPHP (http://thinkphp.cn)
All rights reserved。
ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。

Expand Down

0 comments on commit 29803c0

Please sign in to comment.