Lucas Bartholemy 44d40e33c9 Merge branch 'numeric-ini-value' of https://github.com/githubjeka/humhub into githubjeka-numeric-ini-value ...

# Conflicts:
#	protected/humhub/modules/file/libs/ImageConverter.php

2017-03-16 19:52:49 +01:00

..

config

…

humhub

Merge branch 'numeric-ini-value' of https://github.com/githubjeka/humhub into githubjeka-numeric-ini-value

2017-03-16 19:52:49 +01:00

modules

…

runtime

…

vendor

…

.htaccess

…

yii

…

yii.bat

…