huang 4af3c9816c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq ... Conflicts: db/schema.rb		2015-08-24 17:53:55 +08:00
..
migrate	消息公共表	2015-08-24 17:51:19 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq	2015-08-24 17:53:55 +08:00