-
Merge branch 'master' into 'zj-mattermost-slash-config' · a9d9895dZeger-Jan van de Weg authored
# Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb
a9d9895d
×
BigW Consortium Gitlab
# Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb