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
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`