Lucas Bartholemy 63d6afe0b3 Merge branch 'master' into v1.2-dev ...

# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/modules/admin/components/Controller.php
#	protected/humhub/modules/dashboard/views/dashboard/index.php
#	protected/humhub/modules/dashboard/views/dashboard/index_guest.php
#	themes/HumHub/css/theme.css

2016-10-14 17:30:06 +02:00

..

less

JS Action/Content refactoring Implementation of action components.

2016-05-02 21:40:26 +02:00

config.codekit

Added mime icons

2015-08-30 21:36:05 +02:00

theme.css

Horizontal scrolling images on mobile devices

2016-09-23 15:15:39 +03:00

theme.less

Merge branch 'master' into v1.2-dev

2016-10-14 17:30:06 +02:00