Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
siteconf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Firmware
siteconf
Commits
0c4d0287
Commit
0c4d0287
authored
Jul 6, 2016
by
Johannes Rudolph
Browse files
Options
Downloads
Plain Diff
Merge branch '1.1' into 'master'
1.1 See merge request !11
parents
0257a192
8c7243d0
No related branches found
No related tags found
1 merge request
!11
1.1
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules
+2
-2
2 additions, 2 deletions
modules
site.conf
+1
-1
1 addition, 1 deletion
site.conf
with
3 additions
and
3 deletions
modules
+
2
−
2
View file @
0c4d0287
GLUON_SITE_FEEDS='ffnw'
PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
PACKAGES_FFNW_BRANCH=
master
PACKAGES_FFNW_COMMIT=
1e00147dc145d6020b9c0fd5bab4f4e0433b1919
PACKAGES_FFNW_BRANCH=
1.1
PACKAGES_FFNW_COMMIT=
45b3fbcd9aae6a937bc3ff7e67f408d6d50074ef
This diff is collapsed.
Click to expand it.
site.conf
+
1
−
1
View file @
0c4d0287
...
...
@@ -7,7 +7,7 @@
openwrt
=
'http://openwrt.draic.info/%n/%v/%S/packages'
,
},
prefix4
=
'10.18.0.0/1
7
'
,
prefix4
=
'10.18.0.0/1
6
'
,
prefix6
=
'fd74:fdaa:9dc4::/64'
,
mesh_on_wan
=
false
,
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment