Lucas Bartholemy
708af2787b
Merge branch 'master' into v1.3-dev
# Conflicts:
# composer.json
# protected/humhub/modules/admin/controllers/PendingRegistrationsController.php
# protected/humhub/modules/admin/controllers/UserController.php
# protected/humhub/modules/admin/views/pending-registrations/index.php
# protected/humhub/modules/admin/views/user/index.php
# protected/humhub/modules/space/behaviors/SpaceController.php
# protected/humhub/modules/space/behaviors/SpaceModelMembership.php
# static/less/file.less
# themes/HumHub/css/theme.css
2018-02-13 19:21:27 +01:00
..
2017-06-01 17:49:24 +02:00
2017-01-26 17:44:51 +01:00
2017-07-21 20:53:00 +02:00
2017-01-26 17:44:51 +01:00
2018-02-08 14:28:55 +01:00
2017-01-26 17:44:51 +01:00
2017-02-17 14:42:10 +01:00
2018-02-13 19:21:27 +01:00
2017-09-21 16:52:35 +02:00
2017-03-24 21:25:07 +01:00
2018-02-08 14:28:55 +01:00
2017-01-26 17:44:51 +01:00
2017-01-26 17:44:51 +01:00
2017-01-26 17:44:51 +01:00
2017-01-26 17:44:51 +01:00
2018-02-08 14:28:55 +01:00
2017-01-26 17:44:51 +01:00
2018-02-08 14:28:55 +01:00
2018-02-08 14:28:55 +01:00
2017-12-13 18:24:31 +01:00
2017-07-21 20:53:00 +02:00
2017-01-26 17:44:51 +01:00
2017-07-20 17:54:37 +02:00
2017-01-26 17:44:51 +01:00
2017-01-26 17:44:51 +01:00
2017-03-27 22:47:47 +02:00
2017-01-26 17:44:51 +01:00
2017-06-28 15:30:07 +02:00
2017-01-26 17:44:51 +01:00
2018-02-08 14:28:55 +01:00
2017-01-26 17:44:51 +01:00
2018-01-07 19:23:00 +01:00
2017-12-22 14:46:29 +03:00
2017-01-26 17:44:51 +01:00
2017-01-26 17:44:51 +01:00
2017-01-26 17:44:51 +01:00
2017-03-06 16:42:55 +01:00
2017-01-26 17:44:51 +01:00
2017-01-26 17:44:51 +01:00
2018-01-23 09:50:01 +01:00
2017-01-26 17:44:51 +01:00