Skip to content
Snippets Groups Projects
Commit eefb27f5 authored by Sebastian Ziebell's avatar Sebastian Ziebell
Browse files

Merge branch 'master' into fixes/api

Conflicts:
	spec/requests/api/projects_spec.rb
parents 1b97a2ee b7ac654b
No related branches found
No related tags found
No related merge requests found
Showing
with 96 additions and 92 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment