modified:   .gitignore
	modified:   db/schema.rb
recrutamento versao 1
	new file:   app/assets/javascripts/job_offers.js.coffee
	new file:   app/assets/stylesheets/job_offers.css.scss
	new file:   app/controllers/job_offers_controller.rb
	new file:   app/helpers/job_offers_helper.rb
	modified:   app/models/company.rb
	new file:   app/models/job_offer.rb
	modified:   app/views/companies/show.html.erb
	new file:   app/views/job_offers/edit.html.erb
	new file:   app/views/job_offers/index.html.erb
	new file:   app/views/job_offers/new.html.erb
	new file:   app/views/job_offers/show.html.erb
	modified:   config/routes.rb
	new file:   db/migrate/20121121141730_create_job_offers.rb
	modified:   db/schema.rb
	new file:   test/fixtures/job_offers.yml
	new file:   test/functional/job_offers_controller_test.rb
	new file:   test/unit/helpers/job_offers_helper_test.rb
	new file:   test/unit/job_offer_test.rb
Merge branch 'master' of https://github.com/RasoTeam/platform into recrutamento

Conflicts:
	config/routes.rb
	renamed:    app/controllers/job_offers_controller.rb -> app/controllers/rasocomp/job_offers_controller.rb
	renamed:    app/views/job_offers/edit.html.erb -> app/views/rasocomp/job_offers/edit.html.erb
	renamed:    app/views/job_offers/index.html.erb -> app/views/rasocomp/job_offers/index.html.erb
	renamed:    app/views/job_offers/new.html.erb -> app/views/rasocomp/job_offers/new.html.erb
	renamed:    app/views/job_offers/show.html.erb -> app/views/rasocomp/job_offers/show.html.erb
introducao de candidatos a job offers
	new file:   app/assets/javascripts/rasocomp/candidates.js.coffee
	new file:   app/assets/stylesheets/rasocomp/candidates.css.scss
	new file:   app/controllers/rasocomp/candidates_controller.rb
	modified:   app/controllers/rasocomp/job_offers_controller.rb
	new file:   app/helpers/rasocomp/candidates_helper.rb
	new file:   app/models/candidate.rb
	modified:   app/models/job_offer.rb
	new file:   app/views/rasocomp/candidates/apply.html.erb
	new file:   app/views/rasocomp/candidates/index.html.erb
	new file:   app/views/rasocomp/job_offers/appliances.html.erb
	new file:   app/views/rasocomp/job_offers/createapply.html.erb
	modified:   app/views/rasocomp/job_offers/edit.html.erb
	new file:   app/views/rasocomp/job_offers/formapply.html.erb
	modified:   app/views/rasocomp/job_offers/index.html.erb
	new file:   app/views/rasocomp/job_offers/manage_offer.html.erb
	modified:   app/views/rasocomp/job_offers/show.html.erb
	new file:   app/views/rasocomp/job_offers/showapply.html.erb
	modified:   config/routes.rb
	new file:   db/migrate/20121122010008_create_candidates.rb
	modified:   db/schema.rb
	new file:   test/fixtures/candidates.yml
	new file:   test/functional/rasocomp/candidates_controller_test.rb
	new file:   test/unit/candidate_test.rb
	new file:   test/unit/helpers/rasocomp/candidates_helper_test.rb
Merge branch 'master' of https://github.com/RasoTeam/platform into recrutamento

Conflicts:
	config/routes.rb
	db/schema.rb
Merge branch 'master' of https://github.com/RasoTeam/platform into recrutamento
links
	new file:   app/assets/javascripts/public/job_offers.js.coffee
	new file:   app/assets/stylesheets/public/job_offers.css.scss
	new file:   app/controllers/public/job_offers_controller.rb
	new file:   app/helpers/public/job_offers_helper.rb
	new file:   app/views/public/job_offers/index.html.erb
	new file:   app/views/public/job_offers/new.html.erb
	new file:   app/views/public/job_offers/show.html.erb
	modified:   config/routes.rb
	new file:   test/functional/public/job_offers_controller_test.rb
	new file:   test/unit/helpers/public/job_offers_helper_test.rb
Merge branch 'master' of https://github.com/RasoTeam/platform into recrutamento

Conflicts:
	config/routes.rb