Lucas Bartholemy 062d531da9 Merge branch 'master' into v1.1-dev
Conflicts:
	protected/humhub/config/common.php
	protected/humhub/modules/admin/controllers/UserController.php
	protected/humhub/modules/user/models/User.php
	protected/humhub/modules/user/views/auth/login.php
2016-02-16 15:59:09 +01:00

2 lines
198 B
PHP

<link href="<?php echo $this->theme->getBaseUrl() . '/css/theme.css'; ?>" rel="stylesheet">
<link href="<?php echo $this->theme->getBaseUrl() . '/font/open_sans/open-sans.css'; ?>" rel="stylesheet">