lizanle d26b51c982 Merge branch 'szzh' into dev_zanle ... Conflicts: app/controllers/organizations_controller.rb db/schema.rb		2015-12-31 15:44:57 +08:00
..
migrate	Merge branch 'szzh' into dev_zanle	2015-12-31 15:44:57 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'szzh' into dev_zanle	2015-12-31 15:44:57 +08:00