Skip to content
Commit 3e991230 authored by James Lopez's avatar James Lopez 💬
Browse files

Fix merge conflicts - squashed commit 

# Conflicts:
#	app/models/project.rb
parent 7df495fb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment