daiao 6bd9f47222 Merge branch 'dev_shcool' into develop ... Conflicts: db/schema.rb		2016-07-28 20:02:57 +08:00
..
api/mobile	微信模版消息标题加上句号	2016-07-28 17:55:37 +08:00
assets	Merge branch 'rep_quality' into develop	2016-06-24 19:17:26 +08:00
controllers	Merge branch 'dev_shcool' into develop	2016-07-28 20:02:57 +08:00
helpers	git pull后重新commit	2016-07-28 15:11:04 +08:00
models	Merge branch 'dev_shcool' into develop	2016-07-28 20:02:57 +08:00
services	微信 新建项目默认为私有	2016-07-28 18:21:42 +08:00
sweepers	…
tasks	…
views	Merge branch 'dev_shcool' into develop	2016-07-28 20:02:57 +08:00