caishi 1067d596d9 Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina ... Conflicts: db/schema.rb		2018-11-22 15:46:15 +08:00
..
migrate	表更改	2018-11-22 15:30:25 +08:00
development.sqlite3	…
schema.rb	Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina	2018-11-22 15:46:15 +08:00