jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app
History
william 61e4021625 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/controllers/bids_controller.rb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	config/locales/zh.yml
	config/routes.rb
	lib/redmine.rb
 		2013-09-24 09:52:08 +08:00
..
assets new version 2013-09-12 10:41:15 +08:00
controllers Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-09-24 09:52:08 +08:00
helpers Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-09-24 09:52:08 +08:00
models Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-09-24 09:52:08 +08:00
sweepers first commit 2013-08-01 10:33:49 +08:00
views Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-09-24 09:52:08 +08:00