Tim 89eff0f920 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop ... Conflicts: db/schema.rb		2016-02-20 16:29:28 +08:00
..
migrate	被rubymine坑了，这两个文件没加进去	2016-02-02 18:47:53 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop	2016-02-20 16:29:28 +08:00