Skip to content

Commit

Permalink
BACKPORT-CONFLICT
Browse files Browse the repository at this point in the history
  • Loading branch information
@grische @github-actions
grische authored and github-actions[bot] committed Jun 13, 2024
1 parent 9a3ad69 commit 6231939
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions modules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ PACKAGES_SSIDCHANGER_COMMIT=f266b9e6328f97354f3b8777d1111ad044be9be5
# ffmuc-mesh-vpn-wireguard-vxlan
# ffmuc-ipv6-ra-filter
PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
<<<<<<< HEAD
PACKAGES_COMMUNITY_COMMIT=8f0a9dc2a631c5e1a640fe1d8afc7470be34065a
=======
PACKAGES_COMMUNITY_COMMIT=961897fd1bcebd6d0265707187131149abb0f498
>>>>>>> f88a739 (modules: ffmuc-mesh-vpn-wireguard improve nslookup)
PACKAGES_COMMUNITY_BRANCH=master

0 comments on commit 6231939

Please sign in to comment.