lizanle 90661374a5 Merge branch 'szzh' into dev_zanle ... Conflicts: Gemfile app/controllers/projects_controller.rb config/locales/zh.yml		2015-01-23 10:33:07 +08:00
..
development.rb	Merge branch 'szzh' into dev_zanle	2015-01-23 10:33:07 +08:00
production.rb	生产环境日志名字规定为production.log	2015-01-23 09:50:50 +08:00
test.rb	first commit	2013-08-01 10:33:49 +08:00
test_pgsql.rb	first commit	2013-08-01 10:33:49 +08:00
test_sqlite3.rb	first commit	2013-08-01 10:33:49 +08:00