Skip to content
Snippets Groups Projects
Commit ae7b2ef6 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'master' into issue_12658 

# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
parents 8d544645 0305dd98
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 566 additions and 504 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