mirror of
https://github.com/humhub/humhub.git
synced 2025-03-16 04:59:51 +01:00
# Conflicts: # .travis.yml # protected/humhub/modules/admin/controllers/UserController.php # protected/humhub/modules/comment/models/Comment.php # protected/humhub/modules/post/controllers/PostController.php # protected/humhub/modules/space/Events.php # protected/humhub/modules/user/controllers/AccountController.php # protected/humhub/modules/user/models/User.php