huang c408185b40 Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new ... Conflicts: db/schema.rb		2016-04-05 11:25:25 +08:00
..
migrate	Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new	2016-04-05 11:25:25 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new	2016-04-05 11:25:25 +08:00