bigdir/config
fanqiang 1781d3ba8d Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/views/layouts/base_bids.html.erb
2013-08-01 20:59:29 +08:00
..
environments first commit 2013-08-01 10:33:49 +08:00
initializers first commit 2013-08-01 10:33:49 +08:00
locales first commit 2013-08-01 10:33:49 +08:00
additional_environment.rb first commit 2013-08-01 10:33:49 +08:00
additional_environment.rb.example first commit 2013-08-01 10:33:49 +08:00
application.rb first commit 2013-08-01 10:33:49 +08:00
boot.rb first commit 2013-08-01 10:33:49 +08:00
configuration.yml first commit 2013-08-01 10:33:49 +08:00
configuration.yml.example first commit 2013-08-01 10:33:49 +08:00
database.yml first commit 2013-08-01 10:33:49 +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-08-01 20:59:29 +08:00
settings.yml first commit 2013-08-01 10:33:49 +08:00