jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/spec
History
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 		2016-05-06 10:16:56 +08:00
..
controllers Merge branch 'hjq_beidou' into develop 2016-05-06 10:16:56 +08:00
factories Merge branch 'hjq_beidou' into develop 2016-05-06 10:16:56 +08:00
fixtures 头像上传只允许图片 2015-05-15 16:18:44 +08:00
models Merge branch 'hjq_beidou' into develop 2016-05-06 10:16:56 +08:00
requests 代码重置 2016-03-11 10:18:10 +08:00
support 代码重置 2016-03-11 10:18:10 +08:00
rails_helper.rb 代码重置 2016-03-11 10:18:10 +08:00
seeds.rb 代码重置 2016-03-11 10:18:10 +08:00
shared_account_spec.rb 代码重置 2016-03-11 10:18:10 +08:00
spec_helper.rb 代码重置 2016-03-11 10:18:10 +08:00