Skip to content

Commit 5fbe773

Browse files
authored
Merge branch 'MapServer:main' into main
2 parents ed1b0b0 + 2bb2b22 commit 5fbe773

7 files changed

Lines changed: 482 additions & 10 deletions

File tree

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ jobs:
1313
- name: Backport Bot
1414
id: backport
1515
if: github.event.pull_request.merged && ( ( github.event.action == 'closed' && contains( join( github.event.pull_request.labels.*.name ), 'backport') ) || contains( github.event.label.name, 'backport' ) )
16-
uses: m-kuhn/backport@v1.2.7
16+
uses: m-kuhn/backport@7f3cab83e4b3b26aefcffda21851c3dc3d389f45 #v1.2.7
1717
with:
1818
github_token: ${{ secrets.GITHUB_TOKEN }}

en/development/git.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@ sub-projects:
2828

2929
4. `/tinyows <https://github.com/MapServer/tinyows/>`__: TinyOWS source, used
3030
for WFS transaction support (online editing of features).
31-
32-
5. `/msautotest <https://github.com/MapServer/msautotest/>`__: msautotest files,
33-
used for automatically verifying source changes.
3431

35-
6. `/basemaps <https://github.com/MapServer/basemaps/>`__: basemaps files,
32+
5. `/basemaps <https://github.com/MapServer/basemaps/>`__: basemaps files,
3633
used to generate mapfiles from OpenStreetMap data.
3734

38-
7. `/ms-ogc-workshop <https://github.com/MapServer/ms-ogc-workshop/>`__: OGC Workshop files,
35+
6. `/ms-ogc-workshop <https://github.com/MapServer/ms-ogc-workshop/>`__: OGC Workshop files,
3936
an excellent resource for learning OGC standards (WMS/WFS/WCS/SOS) with MapServer.
4037

4138
Code Developer's GitHub Access

en/development/rfc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,3 +153,4 @@ the project.
153153
ms-rfc-139
154154
ms-rfc-140
155155
ms-rfc-141
156+
ms-rfc-142

0 commit comments

Comments
 (0)