1
Update .gitignore
1
Merge branch 'master' of https://github.com/xy19xiaoyu/GJD into xy19xiaoyu-master

Conflicts:
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
Merge branch 'xy19xiaoyu-master'
1
1
Merge pull request #2 from xy19xiaoyu/master

库同步_入库
1
Merge branch 'master' of github.com:satzcoal/GJD
Merge pull request #1 from satzcoal/master

hello