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

31 lines
471 B
Plaintext
Raw Normal View History

Signed-off-by: alanlong9278 <547533434@qq.com>
2015-04-15 12:30:37 +08:00
*.swp
/.project
/.idea
/.bundle
*.swp
/config/database.yml
/config/configuration.yml
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh Conflicts: .gitignore Gemfile app/views/issues/index.html.erb app/views/layouts/_base_feedback.html.erb app/views/tags/_tag_name.html.erb Signed-off-by: alanlong9278 <547533434@qq.com>
2015-05-08 09:15:50 +08:00
/config/additional_environment.rb
Signed-off-by: alanlong9278 <547533434@qq.com>
2015-04-15 12:30:37 +08:00
/files/*
/log/*
/public/tmp/*
/tmp/*
/public/cache/*
.gitignore
/config/newrelic.yml
/public/images/avatars/*
/Gemfile
/Gemfile.lock
/db/schema.rb
/Gemfile.lock
/lib/plugins/acts_as_versioned/test/debug.log
.rbenv-gemsets
.DS_Store
public/api_doc/
/.metadata
vendor/cache
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh Conflicts: .gitignore Gemfile app/controllers/discuss_demos_controller.rb app/models/user.rb app/views/bids/_bid_homework_show.html.erb app/views/issues/index.html.erb app/views/layouts/_base_feedback.html.erb app/views/poll/publish_poll.js.erb app/views/poll/republish_poll.js.erb public/javascripts/application.js Signed-off-by: alanlong9278 <547533434@qq.com>
2015-04-15 12:36:19 +08:00
/files
/public/images/avatars
/public/files
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh Conflicts: .gitignore Gemfile app/views/issues/index.html.erb app/views/layouts/_base_feedback.html.erb app/views/tags/_tag_name.html.erb Signed-off-by: alanlong9278 <547533434@qq.com>
2015-05-08 09:15:50 +08:00
/tags