This repository has been archived on 2026-04-03. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.

Henrik Hautakoski 4b750f0f37 Merge branch 'dev' into 31-admin-user-management ... # Conflicts: # app/forms/UserSettings.php		2022-08-08 23:37:44 +02:00
..
LogController.php	Update pagination api.	2022-07-26 21:09:36 +02:00
UserController.php	Merge branch 'dev' into 31-admin-user-management	2022-08-08 23:37:44 +02:00