mborzyszkowski 35bc61676f sync master ... # Conflicts: # src/InternshipSystem.Api/Controllers/EditionController.cs # src/InternshipSystem.Core/Entity/Edition.cs # src/InternshipSystem.Core/Entity/Internship/InternshipRegistration.cs # src/InternshipSystem.Core/Entity/Report.cs		2020-08-31 17:22:02 +02:00
..
AspNet.Security.OAuth.MyGut	whatever	2020-08-29 17:25:48 +02:00
InternshipSystem.Api	sync master	2020-08-31 17:22:02 +02:00
InternshipSystem.Core	sync master	2020-08-31 17:22:02 +02:00
InternshipSystem.Repository	sync master	2020-08-31 17:22:02 +02:00