You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Mohamed Rashd aa2fa45a5f Tempory merge conflict resolution		3 years ago
..
main	Tempory merge conflict resolution	3 years ago
test	Setting maintenance user when carbon context user is null + fixing the function which sets statuses of all devices belonging to a user	3 years ago