diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-18 23:22:34 +0100 |
| commit | afb5de955e00490be5762247e817b20722091f37 (patch) | |
| tree | 035b826eacc5a21244c383075138731eaafeaebc /core/templates/layout.user.php | |
| parent | 130c9cad030ca777e23ef70b76822553ea1c6411 (diff) | |
| parent | 31cc9aa80d4284e13dc95d2ef1428bed78c22d65 (diff) | |
| download | nextcloud-server-afb5de955e00490be5762247e817b20722091f37.tar.gz nextcloud-server-afb5de955e00490be5762247e817b20722091f37.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
Diffstat (limited to 'core/templates/layout.user.php')
| -rw-r--r-- | core/templates/layout.user.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b50dc6a2073..1a77b2afdf1 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -70,8 +70,10 @@ </ul> </div></nav> - <div id="content"> - <?php echo $_['content']; ?> + <div id="content-wrapper"> + <div id="content"> + <?php echo $_['content']; ?> + </div> </div> </body> </html> |