yanxd 3517dbb88b Merge branch 'szzh' into develop ... Conflicts: db/schema.rb		2014-05-22 09:58:19 +08:00
..
migrate	Merge branch 'szzh' into develop	2014-05-22 09:58:19 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	1.添加用户申请加入项目contrl、model及相关逻辑	2014-05-21 16:45:11 +08:00