Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge remote-tracking branch 'origin/2.3' into 2.4 #4968

Merged
merged 34 commits into from
Jun 5, 2019
Merged

Merge remote-tracking branch 'origin/2.3' into 2.4 #4968

merged 34 commits into from
Jun 5, 2019

Conversation

sbrunner
Copy link
Member

@sbrunner sbrunner commented Jun 5, 2019

No description provided.

CI and others added 30 commits May 20, 2019 09:16
Add a trivial circleci configuration file to avoid CI error on GitHub
By able to eayier build the project throw a proxy
…efaultLang

Use default_locale_name as value for defaultLang to stay coherent bet…
Fix layers list on WMTS queryLayers i18n
Make it working on old Docker version
@sbrunner sbrunner added this to the dummy milestone Jun 5, 2019
@sbrunner sbrunner requested a review from fredj June 5, 2019 10:01
@sbrunner sbrunner merged commit ad01e04 into 2.4 Jun 5, 2019
@sbrunner sbrunner deleted the merge23 branch June 5, 2019 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants