Skip to content

Commit

Permalink
Merge branch 'release/3.4.12' into v3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
AntoineAugusti committed Dec 19, 2015
2 parents 45bf08a + e5180f6 commit 50e65ad
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 17 deletions.
16 changes: 0 additions & 16 deletions public/build/assets/css/styles.min-8485130ce5.css

This file was deleted.

16 changes: 16 additions & 0 deletions public/build/assets/css/styles.min-c88ff3c1c1.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/build/rev-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"assets/css/styles.min.css": "assets/css/styles.min-8485130ce5.css",
"assets/css/styles.min.css": "assets/css/styles.min-c88ff3c1c1.css",
"assets/js/scripts.min.js": "assets/js/scripts.min-026f200b51.js"
}
2 changes: 2 additions & 0 deletions ressources/sass/screen.scss
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ h3 {

.twitter-follow-button {
margin-top: 15px;
height: 20px;
visibility: hidden;
}

.navbar-nav > li > a > i.fa {
Expand Down

0 comments on commit 50e65ad

Please sign in to comment.