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
..
environments	first commit	2013-08-01 10:33:49 +08:00
initializers	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	2013-08-08 17:01:56 +08:00
locales	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-09-24 09:52:08 +08:00
additional_environment.rb	Add sub-uri	2013-08-11 15:05:55 +08:00
additional_environment.rb.example	first commit	2013-08-01 10:33:49 +08:00
application.rb	修改留言功能	2013-09-14 08:45:18 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	新改	2013-08-15 18:50:44 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
database.yml	modify some little bug && merge handle	2013-09-23 21:47:07 +08:00
database.yml.example	first commit	2013-08-01 10:33:49 +08:00
environment.rb	first commit	2013-08-01 10:33:49 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
routes.rb	Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop	2013-09-24 09:52:08 +08:00
settings.yml	给tag search结果添加了分页。	2013-08-19 17:28:59 +08:00