jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
xianbo 2013-10-30 08:52:21 +08:00
parent 1f419c936d 759a0ad1f5
commit 41b5d48346
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.gitignore vendored
View File

@ -1,16 +1,10 @@
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
/.project
/.bundle
/files/*
/log/*
/test/*
/tmp/*
/public/images/requirements/*
/public/images/avatars/*