jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/views/account
History
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
 		2013-09-23 20:18:03 +08:00
..
login.html.erb new version 2013-09-12 10:41:15 +08:00
logout.html.erb first commit 2013-08-01 10:33:49 +08:00
lost_password.html.erb first commit 2013-08-01 10:33:49 +08:00
password_recovery.html.erb first commit 2013-08-01 10:33:49 +08:00
register.html.erb Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00