Commit 69e758fb authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3.training/git.slides!26
parents 4a773d44 975962e1
Pipeline #8417 canceled with stage
in 4 seconds
......@@ -3,6 +3,7 @@ image: digitallyseamless/nodejs-bower-grunt
pages:
stage: deploy
only:
- develop
- master
script:
- npm install --global npm@latest
......@@ -11,6 +12,7 @@ pages:
- npm install -g generator-reveal
- npm install -g bower
- npm install
- rm -rf public
- grunt dist
artifacts:
......
slides/img
\ No newline at end of file
......@@ -2,61 +2,61 @@
{
"filename": "index.md",
"attr": {
"data-background": "../img/sbgBackgroundWhite.jpg"
"data-background": "img/sbgBackgroundWhite.jpg"
}
},
{
"filename": "overview.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "the_terminal.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "what_is_git.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "installation.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "essential_commands.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "github_gitlab.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "branches.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "best_practices.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
},
{
"filename": "thanks.md",
"attr": {
"data-background": "../img/whiteBG.jpg"
"data-background": "img/whiteBG.jpg"
}
}
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment