freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:freifunk-gluon/site-ffhl

Browse source 
Conflicts:
	site.conf
This commit is contained in:
ohrensessel 2014-03-31 20:38:50 +02:00
commit 1e16fdb9b8
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README
View file

@ -1,4 +1,5 @@
Gluon versions used for specific Lübeck Freifunk Firmware builds: Gluon versions used for specific Lübeck Freifunk Firmware builds:
* 0.4: v2014.1
* 0.4~1-beta2 (0.4 Beta 2): 2c751d3612a7229de878c40ae724611f2f4f0bee * 0.4~1-beta2 (0.4 Beta 2): 2c751d3612a7229de878c40ae724611f2f4f0bee
* 0.3.100-beta1 (0.4 Beta 1): 55a068104fa072ea7cd2decac9584a8f619badbf * 0.3.100-beta1 (0.4 Beta 1): 55a068104fa072ea7cd2decac9584a8f619badbf

2
site.conf
View file

@ -2,7 +2,7 @@
hostname_prefix => 'freifunk', hostname_prefix => 'freifunk',
site_name => 'Freifunk Hamburg', site_name => 'Freifunk Hamburg',
site_code => 'ffhh', site_code => 'ffhh',
release => '0.4~2-exp' . nightly, release => '0.4+0-exp' . nightly,
prefix4 => '10.112.0.0/18', prefix4 => '10.112.0.0/18',
prefix6 => 'fd51:2bb2:fd0d::/64', prefix6 => 'fd51:2bb2:fd0d::/64',