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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon site
Commits
4833c4bb
Commit
4833c4bb
authored
8 years ago
by
Philippe
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://github.com/Philhil/site-ffs
into Philhil-master
Conflicts: i18n/de.po
parents
f469942a
11cf11bd
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
i18n/de.po
+5
-5
5 additions, 5 deletions
i18n/de.po
i18n/en.po
+4
-4
4 additions, 4 deletions
i18n/en.po
site.conf
+3
-2
3 additions, 2 deletions
site.conf
site.mk
+3
-0
3 additions, 0 deletions
site.mk
with
15 additions
and
11 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
