Lucas Bartholemy 8a736d1c81 Merge branch 'master' into v1.2-dev ...

# Conflicts:
#	protected/humhub/config/common.php
#	protected/humhub/modules/content/components/actions/ContentContainerStream.php
#	protected/humhub/modules/space/models/Membership.php
#	protected/humhub/modules/space/views/space/home.php
#	protected/humhub/modules/stream/actions/Stream.php
#	protected/humhub/modules/stream/widgets/StreamViewer.php
#	protected/humhub/modules/user/models/User.php
#	protected/humhub/tests/codeception/acceptance/modules/user/LoginCept.php
#	themes/HumHub/css/theme.css

2016-09-12 19:29:05 +02:00

..

css

Merge branch 'master' into v1.2-dev

2016-09-12 19:29:05 +02:00

font/open_sans

Fixed wrong folder paths to fonts in HumHub theme #381

2014-11-10 18:23:33 +01:00

img

Added mime icons

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

views/layouts

Merge branch 'master' into v1.1-dev

2016-02-16 15:59:09 +01:00

config.codekit

Improved ImageWidget for spaces

2015-11-06 17:07:05 +01:00