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

Conflicts:
	site.conf
This commit is contained in:
ohrensessel 2014-03-21 14:55:11 +01:00
commit 2dbc8bbda8
2 changed files with 4 additions and 1 deletions

View file

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