merge request id	124
Titel	Credit Point system
Beschreibung
Status	merged
Created at	2019-11-11T08:19:20.233Z
Updated at	2019-11-18T07:35:46.045Z
Source branch	feature/LL-130-training-credit-assignment
Target branch	develop
Author	Marcel Pociot
Assignee	Sascha Immig

Discussion notes

added 22 commits 4202bf83...cec7925b - 21 commits from branch develop fb78f5ed - Merge branch 'develop' into 'feature/LL-130-training-credit-assignment' Compare with previous version	Sascha Immig	2019-11-12T08:44:00.019Z
added 1 commit e2e26440 - missed bracket on merge (git-merge) Compare with previous version	Sascha Immig	2019-11-12T09:19:16.587Z
merged	Sascha Immig	2019-11-18T07:35:46.099Z
mentioned in commit dcd5e0014107bbaa06616ef1bc4f148f8b6d40eb	Sascha Immig	2019-11-18T07:35:46.241Z

Merge Commits

Title	Id	Author	Created at	Message
Credit Point system	4202bf8378affe52223e1f42f6a1ea8133fa8c01	Marcel Pociot	2019-11-11T08:03:22.000Z	Credit Point system
missed bracket on merge (git-merge)	e2e264400099f405e15c47db06cd5a1be9dd162d	TUV\immigs	2019-11-12T09:18:47.000Z	missed bracket on merge (git-merge)
Merge branch 'develop' into 'feature/LL-130-training-credit-assignment'	fb78f5ed86fcd6316f10697a0da220435ebb0bde	Sascha Immig	2019-11-12T08:43:44.000Z	Merge branch 'develop' into 'feature/LL-130-training-credit-assignment' # Conflicts: # app/Http/Controllers/Admin/ClientController.php