Skip to content
GitLab
Explore
Sign in
projects.thm.de
GitLab FOSS
Repository
gitlab
config
routes.rb
Find file
Blame
History
Permalink
Merge branch 'master' into '41416-making-instance-wide-data-tools-more-accessible'
· 1b27c457
Luke Bennett
authored
Jul 31, 2018
# Conflicts: # app/models/application_setting.rb # lib/api/settings.rb
1b27c457