owncloud/www — pull request #89 by tomneedham (2014-06-26 09:32:04+00:00)
Title: Merge conf header with main nav bar

Applies this from Jan: https://github.com/owncloud/www/issues/87

@jospoortvliet