lizanle 9138f46301 Merge branch 'szzh' into dev_zanle ... Conflicts: app/controllers/users_controller.rb		2015-08-21 14:10:50 +08:00
..
environments	日志级别在debug环境下 调整为debug	2015-07-27 10:03:45 +08:00
initializers	Merge branch 'szzh' into memcached_alan	2015-05-20 17:42:26 +08:00
locales	Merge branch 'szzh' into dev_hjq	2015-08-15 17:10:02 +08:00
application.rb	视频在公共贴吧的帖子回复里发不	2015-06-04 13:55:38 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	configuration冲突处理	2015-07-03 15:51:54 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
environment.rb	修改contest中出现的逻辑错误	2014-10-23 11:30:34 +08:00
newrelic.yml	newrelic配置文件	2015-01-27 14:25:06 +08:00
oneapm.yml	加入性能分析 oneapm	2015-05-26 23:09:10 +08:00
preinitializer.rb	first commit	2013-08-01 10:33:49 +08:00
routes.rb	Merge branch 'szzh' into dev_zanle	2015-08-21 14:10:50 +08:00
settings.yml	给课程活动慢加上缓存，并且加入了开关	2015-06-18 09:13:20 +08:00