Merge branch 'rebase-rc-changes' into 'master' (bbf7cb53) · Commits · Clemens John / siteconf · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

siteconf
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

bbf7cb53

Commit bbf7cb53 authored 5 years ago by Jan-Tarek Butt

Downloads
- Plain Diff

Merge branch 'rebase-rc-changes' into 'master'

Rebase rc changes

See merge request ffnw-firmware/siteconf!66

parents 55d8d056 083bdcce

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

buildscript.sh 3 additions, 3 deletions

buildscript.sh
gluon_patches/0001-add-gluon-geolocator.patch 1 addition, 1 deletion

gluon_patches/0001-add-gluon-geolocator.patch
gluon_patches/0002-add-gluon-hoodselector-Integrate-VPN-Mode.patch 42 additions, 24 deletions

...ches/0002-add-gluon-hoodselector-Integrate-VPN-Mode.patch
gluon_patches/0003-ffnw-config-migration-from-gluon-node-info-to-geoloc.patch 1 addition, 1 deletion

...fnw-config-migration-from-gluon-node-info-to-geoloc.patch
gluon_patches/0004-hoodselector-to-domain-migration.patch 3 additions, 3 deletions

gluon_patches/0004-hoodselector-to-domain-migration.patch
modules 1 addition, 5 deletions

modules

with 51 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment