Skip to content

Commit

Permalink
Merge pull request #247 from l-atelier-des-chercheurs/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
louis-ev authored Jan 21, 2017
2 parents 80ceaeb + c6f9565 commit 3b79443
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
1 change: 0 additions & 1 deletion client/sass/_print.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

@media print {
body.publi {
background-color:red;
zoom: 0.68;
/*
.navbar-container{display:none;}
Expand Down
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,12 @@
"fluent-ffmpeg": "^2.1.0",
"fs-extra": "^1.0.0",
"ftp": "^0.3.10",
"ftp-deploy": "^1.1.0",
"glob": "*",
"glob-electron": "^0.1.0",
"gm": "^1.22.0",
"gulp-util": "^3.0.7",
"html-pdf": "^2.1.0",
"i18n": "^0.8.3",
"jade": "*",
"jsftp": "^1.5.4",
"markdown-it": "^8.2.2",
"markdown-parse": "^0.2.1",
"marky-mark": "^1.2.1",
"merge": "^1.2.0",
"moment": "^2.12.0",
Expand Down

0 comments on commit 3b79443

Please sign in to comment.