Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon site
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon site
Commits
e850bc9f
Commit
e850bc9f
authored
7 years ago
by
Leonard Penzer
Browse files
Options
Downloads
Plain Diff
Merge branch 'beta' of github.com:freifunk-stuttgart/site-ffs into beta
parents
3d9c1675
80968e58
No related branches found
No related tags found
Loading
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
README.md
+3
-0
3 additions, 0 deletions
README.md
i18n/de.po
+4
-0
4 additions, 0 deletions
i18n/de.po
i18n/en.po
+2
-1
2 additions, 1 deletion
i18n/en.po
modules
+1
-1
1 addition, 1 deletion
modules
site.conf
+19
-11
19 additions, 11 deletions
site.conf
site.mk
+3
-2
3 additions, 2 deletions
site.mk
with
32 additions
and
15 deletions
Loading
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
