huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange ... Conflicts: app/views/repositories/show.html.erb db/schema.rb 处理冲突		2015-12-08 17:13:50 +08:00
..
migrate	Merge branch 'develop' into dev_hjq	2015-12-05 11:39:40 +08:00
development.sqlite3	first commit	2013-08-01 10:33:49 +08:00
schema.rb	Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange	2015-12-08 17:13:50 +08:00