# Conflicts:
#	app/models/members/group_member.rb
#	app/models/members/project_member.rb
#	app/services/notification_service.rb
#	config/initializers/omniauth.rb

[ci skip]