Skip to content
Snippets Groups Projects
Commit 3e991230 authored by James Lopez's avatar James Lopez
Browse files

Fix merge conflicts - squashed commit 

# Conflicts:
#	app/models/project.rb
parent 7df495fb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 476 additions and 333 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment