lib/api/users.rb · 80e7e95bfa42e2b7f9382ff8d44a9bd26c5e380d · nexedi / gitlab-ce · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-11 · 7eb95816
GitLab Bot authored Sep 11, 2018
```
# Conflicts:
#	app/assets/stylesheets/framework/selects.scss

[ci skip]
```
7eb95816