daiao 6bd9f47222 Merge branch 'dev_shcool' into develop ... Conflicts: db/schema.rb		2016-07-28 20:02:57 +08:00
..
migrate	单位名称列表功能	2016-07-28 20:01:22 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'dev_shcool' into develop	2016-07-28 20:02:57 +08:00