PROCESS.md · a4deb7c4ff5dfba1f51002a366074ee11d589d39 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-29 · 3fb488d1
GitLab Bot authored Jun 29, 2018
```
# Conflicts:
#	app/assets/stylesheets/pages/settings.scss

[ci skip]
```
3fb488d1