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
..
.gitkeep	导航栏防止意外http参数不全的错误	2014-02-17 15:37:04 +08:00
memos_controller_test.rb	导航栏防止意外http参数不全的错误	2014-02-17 15:37:04 +08:00
school_controller_test.rb	创建课程处添加了学校	2014-03-21 18:02:55 +08:00
softapplications_controller_test.rb	通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整	2014-04-04 17:54:20 +08:00
test_controller_test.rb	导航栏防止意外http参数不全的错误	2014-02-17 15:37:04 +08:00
users_controller_test.rb	add maoxj fixture to test unit	2014-02-17 16:51:12 +08:00
zipdown_controller_test.rb	zip down controller created	2014-04-16 11:27:08 +08:00