5 4 stable
Compare changes
Files
3
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 5
− 5
@@ -150,10 +150,10 @@ To setup the MySQL/PostgreSQL database and dependencies please see [`doc/install
@@ -357,10 +357,10 @@ GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already