z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: db/schema.rb		2014-07-15 16:16:13 +08:00
..
migrate	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2014-07-15 16:16:13 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）	2014-07-15 16:13:50 +08:00