Merge branch 'v2016.1.x-inn' of https://github.com/Freifunk-Troisdorf/site into v2016.1.x-inn

This commit is contained in:
Stefan Hoffmann 2016-07-02 20:58:35 +02:00
commit 8ff1e34f8a
2 changed files with 4 additions and 1 deletions

View File

@ -1,3 +1,4 @@
GLUON_SITE_FEEDS='tro ffrl' GLUON_SITE_FEEDS='tro ffrl'
PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git PACKAGES_TRO_REPO=https://github.com/Freifunk-Troisdorf/packages.git
@ -5,4 +6,5 @@ PACKAGES_TRO_COMMIT=2d357d8635dff16f4edff2824219b01f7e7de285
PACKAGES_TRO_BRANCH=v2016.1 PACKAGES_TRO_BRANCH=v2016.1
PACKAGES_FFRL_REPO=https://github.com/ffrl/ffrl-packages PACKAGES_FFRL_REPO=https://github.com/ffrl/ffrl-packages
PACKAGES_FFRL_COMMIT=37618c0a3c33420f713080b3b66758b2fe533cbc PACKAGES_FFRL_BRANCH=Branch_v2016.1.x
PACKAGES_FFRL_COMMIT=934ac0ee6031ab2694069fd5ce7f61c9bc255ba0

View File

@ -26,6 +26,7 @@ GLUON_SITE_PACKAGES := \
iptables \ iptables \
haveged \ haveged \
tro-netwatch \ tro-netwatch \
tro-nightboot \
gluon-ssid-changer \ gluon-ssid-changer \
gluon-banner gluon-banner