mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 22:28:51 +01:00
Code Issues Projects Releases Wiki Activity
humhub/themes/HumHub/views/layouts
History
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
..
head.php
Merge branch 'master' into v1.1-dev
2016-02-16 15:59:09 +01:00