wanglinchun 9ac0cbe6a3 Merge branch 'competition' into develop ... Conflicts: Gemfile app/controllers/tags_controller.rb app/views/layouts/_base_header.html.erb config/routes.rb db/schema.rb		2014-04-18 16:03:52 +08:00
..
environments	share completed with fq, xianbo	2013-10-21 08:57:55 +08:00
initializers	加入了对赞功能模块，同时预留了踩功能，但暂时不使用。	2013-08-08 17:01:56 +08:00
locales	Merge branch 'competition' into develop	2014-04-18 16:03:52 +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	0418	2014-04-18 10:46:29 +08:00
boot.rb	first commit	2013-08-01 10:33:49 +08:00
configuration.yml	fix setting about migrate path	2014-01-02 09:11:38 +08:00
configuration.yml.example	first commit	2013-08-01 10:33:49 +08:00
database.yml.example	fixtures fix, header fix dynamic.	2014-02-19 17:23:24 +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 'competition' into develop	2014-04-18 16:03:52 +08:00
settings.yml	fix the show of domain and project page	2014-03-21 20:26:28 +08:00