merge request id	183
Titel	removed everything about watchlist / bookmarked trainings
Beschreibung
Status	merged
Created at	2020-05-06T13:55:58.430Z
Updated at	2020-05-08T08:32:05.629Z
Source branch	feature/LL-288-remove-bookmarks
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 12 commits fc483132...6dd37223 - 11 commits from branch develop 925624ff - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2020-05-07T05:53:25.506Z
added 1 commit bd952d88 - readded code that was removes by merge Compare with previous version	Gregor Gabriel	2020-05-07T06:20:24.004Z
added 1 commit 9fa9fd0f - Fixed merge problems Compare with previous version	Gregor Gabriel	2020-05-07T06:46:50.950Z
merged	Sascha Immig	2020-05-08T08:32:05.675Z
mentioned in commit fe695de845ff19ce505206af0c8f79c950a4f90b	Sascha Immig	2020-05-08T08:32:05.897Z

Merge Commits

Title	Id	Author	Created at	Message
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	925624ff8f5207e5593292495b59a652547f6e4c	TUV\gabrielg	2020-05-07T05:53:19.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-288-remove-bookmarks # Conflicts: # app/Http/Controllers/Admin/UserController.php # resources/views/admin/users/edit.blade.php # resources/views/admin/users/includes/watchlist.blade.php
Fixed merge problems	9fa9fd0f64843c6de84c9363578c427a18c4268b	TUV\gabrielg	2020-05-07T06:46:44.000Z	Fixed merge problems
readded code that was removes by merge	bd952d887cca0a3c71bba0934ba9d318df9d0845	TUV\gabrielg	2020-05-07T06:20:08.000Z	readded code that was removes by merge
removed everything about watchlist	fc4831325dbde79a5605bc2c0416a3c6d80c9b15	TUV\gabrielg	2020-05-06T13:53:28.000Z	removed everything about watchlist