alan 59c77e870c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache ... Conflicts: db/schema.rb public/javascripts/course.js Signed-off-by: alan <547533434@qq.com>		2015-05-27 17:01:52 +08:00
..
migrate	merge	2015-05-15 13:39:26 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache	2015-05-27 17:01:52 +08:00