Skip to content
Snippets Groups Projects
Commit b00a7b18 authored by Leonard Penzer's avatar Leonard Penzer
Browse files

Merge branch 'master' into nightly

parents 5e04eae9 7c9d734f
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \ ...@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
iwinfo iwinfo
DEFAULT_GLUON_RELEASE := 0.6+$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1) DEFAULT_GLUON_RELEASE := 0.7+$(shell date '+%Y.%m.%d-%H.%M')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1)
GLUON_LANGS := de en GLUON_LANGS := de en
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment