Merge branch 'master' of github.com:freifunk-gluon/site-ffhl
Conflicts: site.conf
This commit is contained in:
commit
20f3aac8ba
2 changed files with 2 additions and 1 deletions
1
README
1
README
|
@ -1,3 +1,4 @@
|
|||
Gluon versions used for specific Lübeck Freifunk Firmware builds:
|
||||
|
||||
* 0.4~1-beta2 (0.4 Beta 2): 2c751d3612a7229de878c40ae724611f2f4f0bee
|
||||
* 0.3.100-beta1 (0.4 Beta 1): 55a068104fa072ea7cd2decac9584a8f619badbf
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
hostname_prefix => 'freifunk',
|
||||
site_name => 'Freifunk Hamburg',
|
||||
site_code => 'ffhh',
|
||||
release => '0.3.990-exp' . nightly,
|
||||
release => '0.4~2-exp' . nightly,
|
||||
|
||||
prefix4 => '10.112.0.0/18',
|
||||
prefix6 => 'fd51:2bb2:fd0d::/64',
|
||||
|
|
Loading…
Reference in a new issue