Add a new function for getDailyLimit
file /apps/index/Lib/Model/ArticleModel.class.php
Merge branch 'refs/heads/kontem'
健身计划模块 新增分页功能
健身计划 新增分页功能
缓存
Merge branch 'refs/heads/kontem'
what
Merge remote-tracking branch 'refs/remotes/origin/master'
fix back upload repeated videos
Merge branch 'refs/heads/kontem'
修改了顶部消息块
Merge remote-tracking branch 'refs/remotes/origin/master'
为文章页面的评论点击聚焦
删除掉了文章页面的精华评论
注册页面判断
商店系统，视频播放更新
删除健身计划footer多余部分模板
Merge branch 'refs/heads/kontem'
git changed the ignore file .
Merge remote-tracking branch 'refs/remotes/origin/AnnBranch'

Conflicts:
	aijianmei_front/css/public.css