yunwuxin 80a18db460 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	composer.json

2015-12-15 23:40:27 +08:00

..

behavior

增加vendor behavior目录

2015-12-09 19:11:07 +08:00

com

添加verify和upload扩展类库

2015-12-10 17:28:31 +08:00

org

优化注释

2015-12-15 14:45:41 +08:00

think

Merge remote-tracking branch 'origin/master'

2015-12-15 23:40:27 +08:00

traits

改进 traits\model\adv 的延迟更新数据方法 和 app类对于 空操作的处理

2015-12-14 21:11:00 +08:00