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
..
migrate	Merge branch 'crawl' into develop	2014-05-05 09:11:59 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	数据库迁移：更改了默认的学校logo	2014-04-28 09:44:40 +08:00