fanqiang 2c8580a4e8 Merge branch 'crawl' into develop ... Conflicts: app/controllers/tags_controller.rb app/views/tags/_tag.html.erb app/views/tags/_tag_search_results.html.erb app/views/tags/index.html.erb config/locales/zh.yml config/routes.rb db/schema.rb		2014-05-05 09:11:59 +08:00
..
en.yml	汉化部分	2014-04-01 09:52:52 +08:00
zh.yml	Merge branch 'crawl' into develop	2014-05-05 09:11:59 +08:00