Gemfile.lock · 2e708e2f5883156f33e18fe6d2802404f83abae6 · Richard Fernando Heise Ferreira / cleaning-portalmec · GitLab

Snippets Groups Projects

Forked from PortalMEC / portalmec

Source project has a limited visibility.

9 years ago

Merge branch 'master' into dspace-solr-search · e34c1448

Bruno Nocera Zanette authored 9 years ago

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/shared/application/_header.html.erb
	config/initializers/devise.rb
	config/initializers/repositories.rb
	config/orient_db.yml

e34c1448

Merge branch 'master' into dspace-solr-search

Bruno Nocera Zanette authored 9 years ago

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.erb
	app/views/shared/application/_header.html.erb
	config/initializers/devise.rb
	config/initializers/repositories.rb
	config/orient_db.yml

This project manages its dependencies using Bundler. Learn more