Merge branch 'master' of github.com:freifunk-gluon/site-ffhl
Conflicts: site.conf
This commit is contained in:
commit
1e16fdb9b8
2 changed files with 2 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
|||
hostname_prefix => 'freifunk',
|
||||
site_name => 'Freifunk Hamburg',
|
||||
site_code => 'ffhh',
|
||||
release => '0.4~2-exp' . nightly,
|
||||
release => '0.4+0-exp' . nightly,
|
||||
|
||||
prefix4 => '10.112.0.0/18',
|
||||
prefix6 => 'fd51:2bb2:fd0d::/64',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue