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:
yanxd 2013-12-17 09:31:15 +08:00
parent 10c37b4693 0af3d4488f
commit cca2e6c0fa
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -6,6 +6,8 @@
/log/*
/test/*
/tmp/*
/public/images/requirements/*
/public/images/avatars/*
/config/database.yml
/public/images/avatars/*
/Gemfile
/Gemfile.lock