socialforge/.gitignore

log/*
tmp/pids/server.pid
.project
.svn/
.git/
.bundle
log
/log/development.log
/log/development.scm.stderr.log
test/*
tmp/*
/app/models/tag.rb
/app/models/tag.rb
/public/images/requirements/reference - 副本 - 副本.jpg

/public/images/requirements/*.jpg
first commit 2013-08-01 10:33:49 +08:00			`log/*`
modify the .gitignote file 2013-08-01 10:47:41 +08:00			`tmp/pids/server.pid`
first commit 2013-08-01 10:33:49 +08:00			`.project`
			`.svn/`
			`.git/`
			`.bundle`
			`log`
			`/log/development.log`
			`/log/development.scm.stderr.log`
add test/* and tmp/* to ignore files list 2013-08-01 10:51:53 +08:00			`test/*`
			`tmp/*`
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop Conflicts: app/views/layouts/base_bids.html.erb 2013-08-01 20:59:29 +08:00			`/app/models/tag.rb`
			`/app/models/tag.rb`
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop Conflicts: app/controllers/account_controller.rb app/controllers/my_controller.rb app/controllers/projects_controller.rb app/controllers/users_controller.rb app/helpers/projects_helper.rb app/helpers/users_helper.rb app/models/project.rb app/models/user.rb app/models/user_extensions.rb app/views/account/register.html.erb app/views/bids/_bid_show.html.erb app/views/bids/_history.html.erb app/views/bids/_project_list.html.erb app/views/bids/show.html.erb app/views/files/index.html.erb app/views/layouts/base_bids.html.erb app/views/layouts/base_users.html.erb app/views/my/account.html.erb app/views/users/watch_bids.html.erb config/locales/en.yml config/locales/zh.yml config/routes.rb db/schema.rb lib/redmine.rb public/stylesheets/application.css 2013-09-23 20:18:03 +08:00			`/public/images/requirements/reference - 副本 - 副本.jpg`

			`/public/images/requirements/*.jpg`