You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tim 89eff0f920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb		10 years ago
..
migrate	被rubymine坑了，这两个文件没加进去	10 years ago
development.sqlite3	first commit	12 years ago
schema.rb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	10 years ago