Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign

This commit is contained in:
Henry Oswald
2014-07-22 17:24:51 +01:00
4 changed files with 50 additions and 11 deletions
+3 -1
View File
@@ -1,4 +1,6 @@
extends ../layout
block content
| !{content}
.content.content-alt
.blog
| !{content}