yuanke 283dc86a8b Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange ... Conflicts: db/schema.rb public/assets/wechat/homework_detail.html public/javascripts/wechat/controllers/activity.js		2016-07-28 15:23:12 +08:00
..
migrate	在单位名称列表的数据库表中，增加用户字段	2016-07-26 16:46:31 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	git pull后重新commit	2016-07-28 15:11:04 +08:00